From 058a00a7ef9fd7a061812b38ee772637e0862d63e02f1eb6b483399228465622 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Tue, 7 Apr 2015 18:56:54 +0000 Subject: [PATCH] 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 --- ghc-hslua.changes | 7 +++++++ ghc-hslua.spec | 21 +++++++++++++-------- hslua-0.3.7.tar.gz | 3 --- hslua-0.3.9.tar.gz | 3 +++ include-lua_neutralize_longjmp.patch | 16 ---------------- 5 files changed, 23 insertions(+), 27 deletions(-) delete mode 100644 hslua-0.3.7.tar.gz create mode 100644 hslua-0.3.9.tar.gz delete mode 100644 include-lua_neutralize_longjmp.patch diff --git a/ghc-hslua.changes b/ghc-hslua.changes index 18200fb..f455b57 100644 --- a/ghc-hslua.changes +++ b/ghc-hslua.changes @@ -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 diff --git a/ghc-hslua.spec b/ghc-hslua.spec index 54321b1..ea20157 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %global pkg_name hslua Name: ghc-hslua -Version: 0.3.7 +Version: 0.3.9 Release: 0 Summary: A Lua language interpreter embedding in Haskell -License: MIT Group: System/Libraries +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 -Patch1: include-lua_neutralize_longjmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ghc-Cabal-devel @@ -35,7 +33,6 @@ BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-mtl-devel # End cabal-rpm deps - %if 0%{?sles_version} BuildRequires: lua-devel %else @@ -52,8 +49,10 @@ in www.lua.org. Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other Provides: %{name}-static = %{version}-%{release} -Requires: %{name} = %{version}-%{release} 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} Requires: lua-devel %else @@ -66,26 +65,32 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -%patch1 -p1 + %build %define cabal_configure_options -f system-lua %ghc_lib_build + %install %ghc_lib_install + %post devel %ghc_pkg_recache + %postun devel %ghc_pkg_recache + %files -f %{name}.files %defattr(-,root,root,-) %doc COPYRIGHT + %files devel -f %{name}-devel.files %defattr(-,root,root,-) + %changelog diff --git a/hslua-0.3.7.tar.gz b/hslua-0.3.7.tar.gz deleted file mode 100644 index 68e8c1a..0000000 --- a/hslua-0.3.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58ecc765213577ac1ccac0a1970d76cf1ce26b3588fa30ee6ebbc5d4cf12bae0 -size 127655 diff --git a/hslua-0.3.9.tar.gz b/hslua-0.3.9.tar.gz new file mode 100644 index 0000000..386499b --- /dev/null +++ b/hslua-0.3.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec00c9afca374b7e8f17eadcaf6b6ab6ec7b39633f6e73f783919f1998834967 +size 127831 diff --git a/include-lua_neutralize_longjmp.patch b/include-lua_neutralize_longjmp.patch deleted file mode 100644 index 49e054b..0000000 --- a/include-lua_neutralize_longjmp.patch +++ /dev/null @@ -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,