diff --git a/ghc-hs-bibutils.spec b/ghc-hs-bibutils.spec index a0f6e36..8dc718a 100644 --- a/ghc-hs-bibutils.spec +++ b/ghc-hs-bibutils.spec @@ -11,7 +11,6 @@ License: GPL+ Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz Patch1: hs-bibutils-pkgconfig.patch -Patch2: hs-bibutils-4.17-cbits-cabal.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -44,7 +43,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} %patch1 -p1 -b .orig~ -%patch2 -p1 -b .cbit-2~ # remove copylib rm -r bibutils diff --git a/hs-bibutils-4.17-cbits-cabal.patch b/hs-bibutils-4.17-cbits-cabal.patch deleted file mode 100644 index 2a84ead..0000000 --- a/hs-bibutils-4.17-cbits-cabal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hs-bibutils-4.17/hs-bibutils.cabal~ 2013-03-12 22:35:55.307903389 +0900 -+++ hs-bibutils-4.17/hs-bibutils.cabal 2013-03-23 16:21:10.649154612 +0900 -@@ -70,6 +70,8 @@ - ghc-prof-options: -prof -auto-all - hs-source-dirs: src - extensions: ForeignFunctionInterface -+ c-sources: -+ cbits/stub.c - pkgconfig-depends: bibutils - - if impl(ghc >= 6.10) diff --git a/hs-bibutils-pkgconfig.patch b/hs-bibutils-pkgconfig.patch index 2f45414..49c5712 100644 --- a/hs-bibutils-pkgconfig.patch +++ b/hs-bibutils-pkgconfig.patch @@ -1,5 +1,5 @@ --- hs-bibutils-5.5/hs-bibutils.cabal~ 2014-12-22 03:05:14.000000000 +0900 -+++ hs-bibutils-5.5/hs-bibutils.cabal 2015-01-19 22:45:45.513195145 +0900 ++++ hs-bibutils-5.5/hs-bibutils.cabal 2015-01-28 17:15:55.537956715 +0900 @@ -29,42 +29,6 @@ maintainer: andrea.rossato@unitn.it cabal-version: >= 1.4 @@ -43,14 +43,14 @@ library exposed-modules: Text.Bibutils -@@ -73,29 +37,7 @@ +@@ -73,29 +37,9 @@ ghc-prof-options: -prof -auto-all hs-source-dirs: src extensions: ForeignFunctionInterface - include-dirs: bibutils - includes: bibutils.h -- c-sources: -- cbits/stub.c + c-sources: + cbits/stub.c - bibutils/adsout.c bibutils/adsout_journals.c - bibutils/bibcore.c bibutils/bibl.c bibutils/biblatexin.c - bibutils/bibtexin.c bibutils/bibtexout.c