From 5bea17980dbd00ddd99f46fb11f4c85b1d654e3469c72d554925a6e4c25dc31d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2016 18:15:04 +0000 Subject: [PATCH 1/7] Synchronize builds with devel:languages:haskell:lts:7. OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslua?expand=0&rev=17 --- ghc-hslua.spec | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/ghc-hslua.spec b/ghc-hslua.spec index 10bac16..0041aa3 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -23,13 +23,13 @@ Version: 0.4.1 Release: 0 Summary: A Lua language interpreter embedding in Haskell License: MIT -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros +BuildRequires: lua51-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HUnit-devel @@ -39,8 +39,6 @@ BuildRequires: ghc-hspec-devel BuildRequires: ghc-quickcheck-instances-devel BuildRequires: ghc-text-devel %endif -# End cabal-rpm deps -BuildRequires: lua51-devel %description The Scripting.Lua module is a wrapper of Lua language interpreter as described @@ -56,9 +54,9 @@ Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} +Requires: lua51-devel Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: lua51-devel %description devel This package provides the Haskell %{pkg_name} library development files. @@ -66,21 +64,15 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} - %build %define cabal_configure_options -fsystem-lua %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache From d8a1c316b6c852ab2cb17653dac0cb18950b2a809b051ffc07454fcb20cd544e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2017 18:02:02 +0000 Subject: [PATCH 2/7] synchronize with lts-8 package sett from configuration 0cb270c8d22a0823ab5130d95cc499e186cf864e OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslua?expand=0&rev=18 --- ghc-hslua.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-hslua.spec b/ghc-hslua.spec index 0041aa3..9bc71ab 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hslua # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 8bb1d4d62e3720118217dc6442fa1f44edc535fe78c32313baff9b7453485d33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 5 Aug 2017 02:10:02 +0000 Subject: [PATCH 3/7] osc copypac from project:devel:languages:haskell:lts:9 package:ghc-hslua revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslua?expand=0&rev=19 --- ghc-hslua.changes | 5 +++++ ghc-hslua.spec | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-hslua.changes b/ghc-hslua.changes index c321d0c..fb9336b 100644 --- a/ghc-hslua.changes +++ b/ghc-hslua.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + ------------------------------------------------------------------- Sun Jul 10 17:22:35 UTC 2016 - psimons@suse.com diff --git a/ghc-hslua.spec b/ghc-hslua.spec index 9bc71ab..89de039 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -30,7 +30,6 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros BuildRequires: lua51-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel @@ -81,11 +80,9 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_pkg_recache %files -f %{name}.files -%defattr(-,root,root,-) %doc COPYRIGHT %files devel -f %{name}-devel.files -%defattr(-,root,root,-) %doc CHANGELOG.md README.md examples %changelog From 1887ada9e6985c219e5ebce3fe12b42699d94809b4f6f67320dfc527a975c4e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Aug 2017 08:57:53 +0000 Subject: [PATCH 4/7] osc copypac from project:devel:languages:haskell:lts:9 package:ghc-hslua revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslua?expand=0&rev=20 --- ghc-hslua.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-hslua.spec b/ghc-hslua.spec index 89de039..c7232a7 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -23,7 +23,7 @@ Version: 0.4.1 Release: 0 Summary: A Lua language interpreter embedding in Haskell License: MIT -Group: Development/Languages/Other +Group: Development/Languages/Haskell Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel @@ -50,7 +50,7 @@ it with system-wide Lua installation, use 'system-lua' flag. %package devel Summary: Haskell %{pkg_name} library development files -Group: Development/Libraries/Other +Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires: lua51-devel From 365d80578c45c5c82aefc2de26bc4419561bf0bc5eb404511177dd5fde823eb4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Aug 2017 13:59:16 +0000 Subject: [PATCH 5/7] osc copypac from project:devel:languages:haskell:lts:9 package:ghc-hslua revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslua?expand=0&rev=21 --- ghc-hslua.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-hslua.spec b/ghc-hslua.spec index c7232a7..494371e 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -24,7 +24,7 @@ Release: 0 Summary: A Lua language interpreter embedding in Haskell License: MIT Group: Development/Languages/Haskell -Url: https://hackage.haskell.org/package/%{pkg_name} +URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel From 8a5426037cca5374d8a2a8134cdd68af0a5b213f8f127da0e0b66e874b89f158 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 17 Aug 2017 09:51:00 +0000 Subject: [PATCH 6/7] Accepting request 517341 from home:dimstar:Factory - Fix build with the new lua package layout by specifying --extra-include-dirs based on lua.pc. OBS-URL: https://build.opensuse.org/request/show/517341 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslua?expand=0&rev=22 --- ghc-hslua.changes | 6 ++++++ ghc-hslua.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ghc-hslua.changes b/ghc-hslua.changes index fb9336b..0473ca8 100644 --- a/ghc-hslua.changes +++ b/ghc-hslua.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 17 09:35:36 UTC 2017 - dimstar@opensuse.org + +- Fix build with the new lua package layout by specifying + --extra-include-dirs based on lua.pc. + ------------------------------------------------------------------- Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com diff --git a/ghc-hslua.spec b/ghc-hslua.spec index 494371e..6119845 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -24,7 +24,7 @@ Release: 0 Summary: A Lua language interpreter embedding in Haskell License: MIT Group: Development/Languages/Haskell -URL: https://hackage.haskell.org/package/%{pkg_name} +Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel @@ -64,7 +64,7 @@ This package provides the Haskell %{pkg_name} library development files. %setup -q -n %{pkg_name}-%{version} %build -%define cabal_configure_options -fsystem-lua +%define cabal_configure_options -fsystem-lua --extra-include-dirs=$(pkg-config --variable=includedir lua) %ghc_lib_build %install From 3b7864635c46d680aea0e54962f9f44938dc1dcb1a1910b50d619f4a7a4b0152 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 17 Aug 2017 12:47:38 +0000 Subject: [PATCH 7/7] osc copypac from project:devel:languages:haskell:lts:9 package:ghc-hslua revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslua?expand=0&rev=23 --- ghc-hslua.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-hslua.spec b/ghc-hslua.spec index 6119845..5e2892f 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -23,8 +23,8 @@ Version: 0.4.1 Release: 0 Summary: A Lua language interpreter embedding in Haskell License: MIT -Group: Development/Languages/Haskell -Url: https://hackage.haskell.org/package/%{pkg_name} +Group: Development/Libraries/Haskell +URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel