[ghc-citeproc-hs] update to 0.3.6 with cabal-rpm

[Jens Petersen]

commit 412039822d9a087aa4c6fd781c599abf4e552852
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Nov 6 21:57:35 2012 +0900

    update to 0.3.6 with cabal-rpm
    
    override hexpat and bibutils flags

 .gitignore              |    1 +
 citeproc-hs-flags.patch |   20 ++++++++++++++++++++
 ghc-citeproc-hs.spec    |   30 +++++++++++++++++++++---------
 sources                 |    2 +-
 4 files changed, 43 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f82921..aae87cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /citeproc-hs-0.3.2.tar.gz
 /citeproc-hs-0.3.3.tar.gz
 /citeproc-hs-0.3.4.tar.gz
+/citeproc-hs-0.3.6.tar.gz
diff --git a/citeproc-hs-flags.patch b/citeproc-hs-flags.patch
new file mode 100644
index 0000000..b7d5732
--- /dev/null
+++ b/citeproc-hs-flags.patch
@@ -0,0 +1,20 @@
+--- citeproc-hs-0.3.6/citeproc-hs.cabal~	2012-10-27 01:53:55.000000000 +0900
++++ citeproc-hs-0.3.6/citeproc-hs.cabal	2012-11-06 21:50:42.037744508 +0900
+@@ -72,7 +72,7 @@
+ 
+ flag bibutils
+   description: Use Chris Putnam's Bibutils.
+-  default:     True
++  default:     False
+ 
+ flag network
+   description: Use network and HTTP to retrieve csl file from URIs.
+@@ -80,7 +80,7 @@
+ 
+ flag hexpat
+   description: Use hexpat to parse XML
+-  default:     True
++  default:     False
+ 
+ flag embed_data_files
+   description: Embed locale files into the library (needed for windows packaging)
diff --git a/ghc-citeproc-hs.spec b/ghc-citeproc-hs.spec
index 5a1d4f4..bcdc5cb 100644
--- a/ghc-citeproc-hs.spec
+++ b/ghc-citeproc-hs.spec
@@ -1,4 +1,3 @@
-# cabal2spec-0.25.2
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
@@ -11,26 +10,34 @@ into a variety of styles using a macro language called\
 Citation Style Language (CSL): http://citationstyles.org/.
 
 Name:           ghc-%{pkg_name}
-Version:        0.3.4
-Release:        7%{?dist}
+Version:        0.3.6
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
-Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-ExclusiveArch:  %{ghc_arches}
+Patch1:         citeproc-hs-flags.patch
+
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
+BuildRequires:  ghc-rpm-macros
+# Begin cabal-rpm deps:
+BuildRequires:  ghc-HTTP-devel
+BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-json-devel
 BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-network-devel
+BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-pandoc-types-devel
 BuildRequires:  ghc-parsec-devel
 BuildRequires:  ghc-syb-devel
-BuildRequires:  ghc-utf8-string-devel
 BuildRequires:  ghc-time-devel
+BuildRequires:  ghc-utf8-string-devel
 BuildRequires:  ghc-xml-devel
+# End cabal-rpm deps
 
 %description
 %{common_description}
@@ -38,6 +45,7 @@ BuildRequires:  ghc-xml-devel
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
 
 
 %build
@@ -47,7 +55,6 @@ BuildRequires:  ghc-xml-devel
 %install
 %ghc_lib_install
 
-echo %{_datadir}/%{pkg_name}-%{version} >> ghc-citeproc-hs%{?ghc_without_shared:-devel}.files
 
 %ghc_devel_package
 
@@ -59,9 +66,14 @@ echo %{_datadir}/%{pkg_name}-%{version} >> ghc-citeproc-hs%{?ghc_without_shared:
 
 %ghc_files LICENSE
 %doc README
+%{_datadir}/%{pkg_name}-%{version}
 
 
 %changelog
+* Tue Nov 06 2012 Jens Petersen <petersen at redhat.com> - 0.3.6-1
+- update to 0.3.6 with cabal-rpm
+- override hexpat and bibutils flags
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index ef8e93c..2f115c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3891e64c624454721c7da17b12cd2158  citeproc-hs-0.3.4.tar.gz
+1d1d08f2299ec4d3380be0a185989e5f  citeproc-hs-0.3.6.tar.gz