From 1ea4321a4ed454b5ee91ea0e99105ca2371cd196 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mar 23 2013 07:24:34 +0000 Subject: add back missing cbits to .cabal file --- diff --git a/ghc-hs-bibutils.spec b/ghc-hs-bibutils.spec index ef48941..56e4e2e 100644 --- a/ghc-hs-bibutils.spec +++ b/ghc-hs-bibutils.spec @@ -11,13 +11,14 @@ MODS-format XML intermediate. Name: ghc-%{pkg_name} Version: 4.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} License: GPL+ URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{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 @@ -32,7 +33,8 @@ BuildRequires: pkgconfig(bibutils) %prep %setup -q -n %{pkg_name}-%{version} -%patch1 -p1 -b .orig +%patch1 -p1 -b .orig~ +%patch2 -p1 -b .cbit-2~ # remove copylib rm -r bibutils @@ -62,6 +64,9 @@ Requires: pkgconfig(bibutils) %changelog +* Sat Mar 23 2013 Jens Petersen - 4.17-2 +- add back missing cbits to .cabal file + * Tue Mar 12 2013 Jens Petersen - 4.17-1 - update to 4.17 diff --git a/hs-bibutils-4.17-cbits-cabal.patch b/hs-bibutils-4.17-cbits-cabal.patch new file mode 100644 index 0000000..2a84ead --- /dev/null +++ b/hs-bibutils-4.17-cbits-cabal.patch @@ -0,0 +1,11 @@ +--- 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)