Accepting request 294836 from devel:languages:haskell:pandoc
update: drop patch OBS-URL: https://build.opensuse.org/request/show/294836 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslua?expand=0&rev=7
This commit is contained in:
parent
03b3cf90ad
commit
058a00a7ef
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 7 16:55:39 UTC 2015 - peter.trommler@ohm-hochschule.de
|
||||||
|
|
||||||
|
- update to 0.3.9
|
||||||
|
- drop include-lua_neutralize_longjmp.patch
|
||||||
|
* fixed upstream
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Mar 26 15:48:38 UTC 2014 - peter.trommler@ohm-hochschule.de
|
Wed Mar 26 15:48:38 UTC 2014 - peter.trommler@ohm-hochschule.de
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package ghc-hslua
|
# spec file for package ghc-hslua
|
||||||
#
|
#
|
||||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -15,19 +15,17 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%global pkg_name hslua
|
%global pkg_name hslua
|
||||||
|
|
||||||
Name: ghc-hslua
|
Name: ghc-hslua
|
||||||
Version: 0.3.7
|
Version: 0.3.9
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A Lua language interpreter embedding in Haskell
|
Summary: A Lua language interpreter embedding in Haskell
|
||||||
License: MIT
|
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
|
|
||||||
|
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
|
||||||
Patch1: include-lua_neutralize_longjmp.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
@ -35,7 +33,6 @@ BuildRequires: ghc-rpm-macros
|
|||||||
# Begin cabal-rpm deps:
|
# Begin cabal-rpm deps:
|
||||||
BuildRequires: ghc-mtl-devel
|
BuildRequires: ghc-mtl-devel
|
||||||
# End cabal-rpm deps
|
# End cabal-rpm deps
|
||||||
|
|
||||||
%if 0%{?sles_version}
|
%if 0%{?sles_version}
|
||||||
BuildRequires: lua-devel
|
BuildRequires: lua-devel
|
||||||
%else
|
%else
|
||||||
@ -52,8 +49,10 @@ in www.lua.org.
|
|||||||
Summary: Haskell %{pkg_name} library development files
|
Summary: Haskell %{pkg_name} library development files
|
||||||
Group: Development/Libraries/Other
|
Group: Development/Libraries/Other
|
||||||
Provides: %{name}-static = %{version}-%{release}
|
Provides: %{name}-static = %{version}-%{release}
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
Requires: ghc-compiler = %{ghc_version}
|
Requires: ghc-compiler = %{ghc_version}
|
||||||
|
Requires(post): ghc-compiler = %{ghc_version}
|
||||||
|
Requires(postun): ghc-compiler = %{ghc_version}
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
%if 0%{?sles_version}
|
%if 0%{?sles_version}
|
||||||
Requires: lua-devel
|
Requires: lua-devel
|
||||||
%else
|
%else
|
||||||
@ -66,26 +65,32 @@ This package provides the Haskell %{pkg_name} library development files.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{pkg_name}-%{version}
|
%setup -q -n %{pkg_name}-%{version}
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%define cabal_configure_options -f system-lua
|
%define cabal_configure_options -f system-lua
|
||||||
%ghc_lib_build
|
%ghc_lib_build
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%ghc_lib_install
|
%ghc_lib_install
|
||||||
|
|
||||||
|
|
||||||
%post devel
|
%post devel
|
||||||
%ghc_pkg_recache
|
%ghc_pkg_recache
|
||||||
|
|
||||||
|
|
||||||
%postun devel
|
%postun devel
|
||||||
%ghc_pkg_recache
|
%ghc_pkg_recache
|
||||||
|
|
||||||
|
|
||||||
%files -f %{name}.files
|
%files -f %{name}.files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc COPYRIGHT
|
%doc COPYRIGHT
|
||||||
|
|
||||||
|
|
||||||
%files devel -f %{name}-devel.files
|
%files devel -f %{name}-devel.files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:58ecc765213577ac1ccac0a1970d76cf1ce26b3588fa30ee6ebbc5d4cf12bae0
|
|
||||||
size 127655
|
|
3
hslua-0.3.9.tar.gz
Normal file
3
hslua-0.3.9.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ec00c9afca374b7e8f17eadcaf6b6ab6ec7b39633f6e73f783919f1998834967
|
||||||
|
size 127831
|
@ -1,16 +0,0 @@
|
|||||||
Make sure to include the custom lua_neutralize_longjmp function
|
|
||||||
when using the system lua library.
|
|
||||||
|
|
||||||
diff -Nrup a/hslua.cabal b/hslua.cabal
|
|
||||||
--- a/hslua.cabal 2013-10-05 13:24:23.000000000 +0200
|
|
||||||
+++ b/hslua.cabal 2013-10-21 21:51:56.031113660 +0200
|
|
||||||
@@ -30,7 +30,8 @@ Library
|
|
||||||
Exposed-modules: Scripting.Lua, Scripting.Lua.ConfigFile
|
|
||||||
Hs-source-dirs: src
|
|
||||||
if flag(system-lua)
|
|
||||||
- Pkgconfig-depends: lua
|
|
||||||
+ Pkgconfig-depends: lua
|
|
||||||
+ C-sources: src/ntrljmp.c
|
|
||||||
else
|
|
||||||
C-sources: src/lapi.c, src/lauxlib.c, src/lbaselib.c, src/lcode.c,
|
|
||||||
src/ldblib.c, src/ldebug.c, src/ldo.c, src/ldump.c, src/lfunc.c,
|
|
Loading…
Reference in New Issue
Block a user