From e2294809433dd3275109984949fec4e69fc996e6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:45:08 +0800 Subject: [PATCH] refresh to cabal-rpm-0.13 --- ghc-hslua.spec | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/ghc-hslua.spec b/ghc-hslua.spec index f4e6134..2edcd45 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hslua @@ -8,23 +8,25 @@ Name: ghc-%{pkg_name} Version: 0.9.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Lua language interpreter embedding in Haskell License: MIT Url: https://hackage.haskell.org/package/%{pkg_name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +# End cabal-rpm sources Patch0: hslua-system-lua.patch +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-exceptions-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-text-devel -BuildRequires: pkgconfig(lua) +BuildRequires: lua-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-quickcheck-instances-devel @@ -51,7 +53,7 @@ Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} # Begin cabal-rpm deps: -Requires: pkgconfig(lua) +Requires: lua-devel%{?_isa} # End cabal-rpm deps %description devel @@ -59,7 +61,9 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +# End cabal-rpm setup %patch0 -p1 -b .orig sed -i "/fail /d" hslua.cabal #cabal-tweak-drop-dep '\", fail >= 4.9 && < 5\"' @@ -67,12 +71,15 @@ rm -r lua-5.3.4 %build -%define cabal_configure_options -f -luajit -f use-pkgconfig +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %check @@ -88,7 +95,9 @@ rm -r lua-5.3.4 %files -f %{name}.files +# Begin cabal-rpm files: %license COPYRIGHT +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -96,6 +105,9 @@ rm -r lua-5.3.4 %changelog +* Sun Feb 17 2019 Jens Petersen - 0.9.5.2-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.9.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild