build with compat-lua for lua-5.1
This commit is contained in:
parent
6450f9319f
commit
bbc71ee507
@ -4,19 +4,21 @@
|
|||||||
|
|
||||||
Name: ghc-%{pkg_name}
|
Name: ghc-%{pkg_name}
|
||||||
Version: 0.3.10
|
Version: 0.3.10
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Lua language interpreter embedded in Haskell
|
Summary: Lua language interpreter embedded in Haskell
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://hackage.haskell.org/package/%{pkg_name}
|
URL: http://hackage.haskell.org/package/%{pkg_name}
|
||||||
Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
|
Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
|
||||||
|
Patch0: hslua-0.3.10-pkgconfig-lua-5.1.patch
|
||||||
|
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
BuildRequires: ghc-rpm-macros
|
BuildRequires: ghc-rpm-macros
|
||||||
# Begin cabal-rpm deps:
|
# Begin cabal-rpm deps:
|
||||||
BuildRequires: ghc-mtl-devel
|
BuildRequires: ghc-mtl-devel
|
||||||
BuildRequires: pkgconfig(lua)
|
|
||||||
# End cabal-rpm deps
|
# End cabal-rpm deps
|
||||||
|
# current hslua needs 5.1 whereas F20+ has lua-5.2
|
||||||
|
BuildRequires: pkgconfig(lua-5.1)
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The Scripting.Lua module is a wrapper of the Lua language interpreter described
|
The Scripting.Lua module is a wrapper of the Lua language interpreter described
|
||||||
@ -31,8 +33,8 @@ Requires(post): ghc-compiler = %{ghc_version}
|
|||||||
Requires(postun): ghc-compiler = %{ghc_version}
|
Requires(postun): ghc-compiler = %{ghc_version}
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
# Begin cabal-rpm deps:
|
# Begin cabal-rpm deps:
|
||||||
Requires: pkgconfig(lua)
|
|
||||||
# End cabal-rpm deps
|
# End cabal-rpm deps
|
||||||
|
Requires: pkgconfig(lua-5.1)
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
This package provides the Haskell %{pkg_name} library development files.
|
This package provides the Haskell %{pkg_name} library development files.
|
||||||
@ -40,7 +42,7 @@ This package provides the Haskell %{pkg_name} library development files.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{pkg_name}-%{version}
|
%setup -q -n %{pkg_name}-%{version}
|
||||||
|
%patch0 -p1 -b .lua~
|
||||||
cabal-tweak-flag system-lua True
|
cabal-tweak-flag system-lua True
|
||||||
rm src/*.c src/*.h
|
rm src/*.c src/*.h
|
||||||
|
|
||||||
@ -69,6 +71,9 @@ rm src/*.c src/*.h
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 22 2014 Jens Petersen <petersen@redhat.com> - 0.3.10-2
|
||||||
|
- hslua needs lua-5.1 so build with compat-lua
|
||||||
|
|
||||||
* Wed Jan 22 2014 Jens Petersen <petersen@redhat.com> - 0.3.10-1
|
* Wed Jan 22 2014 Jens Petersen <petersen@redhat.com> - 0.3.10-1
|
||||||
- update to 0.3.10 (#1009375)
|
- update to 0.3.10 (#1009375)
|
||||||
- update license to MIT (#1009375)
|
- update license to MIT (#1009375)
|
||||||
|
11
hslua-0.3.10-pkgconfig-lua-5.1.patch
Normal file
11
hslua-0.3.10-pkgconfig-lua-5.1.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- hslua-0.3.10/hslua.cabal~ 2014-01-22 10:24:05.704696822 +0900
|
||||||
|
+++ hslua-0.3.10/hslua.cabal 2014-01-22 16:57:10.384860068 +0900
|
||||||
|
@@ -30,7 +30,7 @@
|
||||||
|
Exposed-modules: Scripting.Lua, Scripting.Lua.ConfigFile
|
||||||
|
Hs-source-dirs: src
|
||||||
|
if flag(system-lua)
|
||||||
|
- Pkgconfig-depends: lua
|
||||||
|
+ Pkgconfig-depends: lua-5.1
|
||||||
|
C-sources: cbits/ntrljmp.c
|
||||||
|
Include-dirs: cbits
|
||||||
|
else
|
Loading…
Reference in New Issue
Block a user