From b41ca9f01ddc6daf58477952bb594379899f411a Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Mar 12 2013 13:36:29 +0000
Subject: update to 4.17


---

diff --git a/.gitignore b/.gitignore
index bd6ba3b..682b7fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /hs-bibutils-4.15.tar.gz
+/hs-bibutils-4.17.tar.gz
diff --git a/ghc-hs-bibutils.spec b/ghc-hs-bibutils.spec
index ee619e9..ef48941 100644
--- a/ghc-hs-bibutils.spec
+++ b/ghc-hs-bibutils.spec
@@ -10,13 +10,14 @@ converts between various bibliography formats using a common\
 MODS-format XML intermediate.
 
 Name:           ghc-%{pkg_name}
-Version:        4.15
-Release:        3%{?dist}
+Version:        4.17
+Release:        1%{?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
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -24,7 +25,6 @@ BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-syb-devel
 BuildRequires:  pkgconfig(bibutils)
 # End cabal-rpm deps
-Patch1:         hs-bibutils-4.15-pkgconfig.patch
 
 %description
 %{common_description}
@@ -62,6 +62,9 @@ Requires:       pkgconfig(bibutils)
 
 
 %changelog
+* Tue Mar 12 2013 Jens Petersen <petersen@redhat.com> - 4.17-1
+- update to 4.17
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/hs-bibutils-4.15-pkgconfig.patch b/hs-bibutils-4.15-pkgconfig.patch
deleted file mode 100644
index b3bbdc5..0000000
--- a/hs-bibutils-4.15-pkgconfig.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u hs-bibutils-4.15/hs-bibutils.cabal.orig hs-bibutils-4.15/hs-bibutils.cabal
---- hs-bibutils-4.15/hs-bibutils.cabal.orig	2012-09-28 03:47:26.000000000 +0900
-+++ hs-bibutils-4.15/hs-bibutils.cabal	2012-10-01 19:50:09.140887514 +0900
-@@ -68,27 +68,9 @@
-     ghc-prof-options: -prof -auto-all
-     hs-source-dirs:   src
-     extensions:       ForeignFunctionInterface
--    include-dirs:     bibutils
--    includes:         bibutils.h
-     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
--        bibutils/bibtextypes.c bibutils/bibutils.c bibutils/bltypes.c
--        bibutils/charsets.c bibutils/copacin.c bibutils/copactypes.c
--        bibutils/doi.c bibutils/ebiin.c bibutils/endin.c
--        bibutils/endout.c bibutils/endtypes.c bibutils/endxmlin.c
--        bibutils/entities.c bibutils/fields.c bibutils/gb18030.c
--        bibutils/is_ws.c bibutils/isiin.c bibutils/isiout.c
--        bibutils/isitypes.c bibutils/latex.c bibutils/list.c
--        bibutils/marc.c bibutils/medin.c bibutils/modsin.c
--        bibutils/modsout.c bibutils/modstypes.c bibutils/name.c
--        bibutils/newstr.c bibutils/newstr_conv.c bibutils/reftypes.c
--        bibutils/risin.c bibutils/risout.c bibutils/ristypes.c
--        bibutils/vplist.c bibutils/serialno.c bibutils/strsearch.c
--        bibutils/title.c bibutils/utf8.c bibutils/wordin.c
--        bibutils/wordout.c bibutils/xml.c bibutils/xml_encoding.c
-+    pkgconfig-depends: bibutils
- 
-     if impl(ghc >= 6.10)
-        build-depends: base >= 4, syb
diff --git a/hs-bibutils-pkgconfig.patch b/hs-bibutils-pkgconfig.patch
new file mode 100644
index 0000000..758533b
--- /dev/null
+++ b/hs-bibutils-pkgconfig.patch
@@ -0,0 +1,32 @@
+--- hs-bibutils-4.17/hs-bibutils.cabal~	2013-02-15 00:44:34.000000000 +0900
++++ hs-bibutils-4.17/hs-bibutils.cabal	2013-03-12 22:33:26.458153916 +0900
+@@ -70,28 +70,7 @@
+     ghc-prof-options: -prof -auto-all
+     hs-source-dirs:   src
+     extensions:       ForeignFunctionInterface
+-    include-dirs:     bibutils
+-    includes:         bibutils.h
+-    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
+-        bibutils/bibtextypes.c bibutils/bibutils.c bibutils/bltypes.c
+-        bibutils/charsets.c bibutils/copacin.c bibutils/copactypes.c
+-        bibutils/doi.c bibutils/ebiin.c bibutils/endin.c
+-        bibutils/endout.c bibutils/endtypes.c bibutils/endxmlin.c
+-        bibutils/entities.c bibutils/fields.c bibutils/gb18030.c
+-        bibutils/intlist.c bibutils/is_ws.c bibutils/isiin.c
+-        bibutils/isiout.c bibutils/isitypes.c bibutils/iso639_2.c
+-        bibutils/latex.c bibutils/list.c bibutils/marc.c
+-        bibutils/medin.c bibutils/modsin.c bibutils/modsout.c
+-        bibutils/modstypes.c bibutils/name.c bibutils/newstr.c
+-        bibutils/newstr_conv.c bibutils/reftypes.c bibutils/risin.c
+-        bibutils/risout.c bibutils/ristypes.c bibutils/vplist.c
+-        bibutils/serialno.c bibutils/strsearch.c bibutils/title.c
+-        bibutils/unicode.c bibutils/utf8.c bibutils/wordin.c
+-        bibutils/wordout.c bibutils/xml.c bibutils/xml_encoding.c
++    pkgconfig-depends: bibutils
+ 
+     if impl(ghc >= 6.10)
+        build-depends: base >= 4, syb
diff --git a/sources b/sources
index 58c3937..f20bac2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6d6ad65e57a0a5ae344d35204b0d865  hs-bibutils-4.15.tar.gz
+4c3d2008a26167531e870b4ef9a9312f  hs-bibutils-4.17.tar.gz