Compare commits

...

1 Commits

Author SHA1 Message Date
Jens Petersen 33ea70bd46 Revert "build with compat-lua for lua-5.1"
This reverts commit bbc71ee507.
2016-12-03 15:50:16 +09:00
2 changed files with 6 additions and 19 deletions

View File

@ -4,21 +4,19 @@
Name: ghc-%{pkg_name}
Version: 0.3.10
Release: 2%{?dist}
Release: 1.1%{?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
@ -33,8 +31,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.
@ -42,7 +40,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
@ -71,8 +69,8 @@ rm src/*.c src/*.h
%changelog
* Wed Jan 22 2014 Jens Petersen <petersen@redhat.com> - 0.3.10-2
- hslua needs lua-5.1 so build with compat-lua
* Sat Dec 3 2016 Jens Petersen <petersen@redhat.com> - 0.3.10-1.1
- rebuild
* Wed Jan 22 2014 Jens Petersen <petersen@redhat.com> - 0.3.10-1
- update to 0.3.10 (#1009375)

View File

@ -1,11 +0,0 @@
--- 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