[ghc-hslua] build with compat-lua for lua-5.1
Jens Petersen
petersen at fedoraproject.org
Wed Jan 22 08:13:51 UTC 2014
commit bbc71ee507e6812e4b28968c61753225d42154a0
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Jan 22 17:14:03 2014 +0900
build with compat-lua for lua-5.1
ghc-hslua.spec | 13 +++++++++----
hslua-0.3.10-pkgconfig-lua-5.1.patch | 11 +++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/ghc-hslua.spec b/ghc-hslua.spec
index 0342b52..cc5e29f 100644
--- a/ghc-hslua.spec
+++ b/ghc-hslua.spec
@@ -4,19 +4,21 @@
Name: ghc-%{pkg_name}
Version: 0.3.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lua language interpreter embedded in Haskell
License: MIT
URL: http://hackage.haskell.org/package/%{pkg_name}
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-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-mtl-devel
-BuildRequires: pkgconfig(lua)
# End cabal-rpm deps
+# current hslua needs 5.1 whereas F20+ has lua-5.2
+BuildRequires: pkgconfig(lua-5.1)
%description
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: %{name}%{?_isa} = %{version}-%{release}
# Begin cabal-rpm deps:
-Requires: pkgconfig(lua)
# End cabal-rpm deps
+Requires: pkgconfig(lua-5.1)
%description devel
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
%setup -q -n %{pkg_name}-%{version}
-
+%patch0 -p1 -b .lua~
cabal-tweak-flag system-lua True
rm src/*.c src/*.h
@@ -69,6 +71,9 @@ rm src/*.c src/*.h
%changelog
+* Wed Jan 22 2014 Jens Petersen <petersen at redhat.com> - 0.3.10-2
+- hslua needs lua-5.1 so build with compat-lua
+
* Wed Jan 22 2014 Jens Petersen <petersen at redhat.com> - 0.3.10-1
- update to 0.3.10 (#1009375)
- update license to MIT (#1009375)
diff --git a/hslua-0.3.10-pkgconfig-lua-5.1.patch b/hslua-0.3.10-pkgconfig-lua-5.1.patch
new file mode 100644
index 0000000..8adddc8
--- /dev/null
+++ b/hslua-0.3.10-pkgconfig-lua-5.1.patch
@@ -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
More information about the scm-commits
mailing list