[ghc-cairo] update to 0.12.2 and cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Wed Jan 4 13:23:49 UTC 2012


commit b40095110a0ff0aedc610f0cd6d34e768ac7f499
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jan 4 22:23:43 2012 +0900

    update to 0.12.2 and cabal2spec-0.25.2

 .gitignore     |    1 +
 ghc-cairo.spec |   37 +++++++++++++++++++++++++++----------
 sources        |    2 +-
 3 files changed, 29 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c3a27c..13976ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /cairo-0.11.1.tar.gz
 /cairo-0.12.0.tar.gz
 /cairo-0.12.1.tar.gz
+/cairo-0.12.2.tar.gz
diff --git a/ghc-cairo.spec b/ghc-cairo.spec
index 531b4a4..814ab6d 100644
--- a/ghc-cairo.spec
+++ b/ghc-cairo.spec
@@ -1,27 +1,32 @@
+# cabal2spec- at CABAL2SPEC_VERSION@
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name cairo
 
 %global common_summary Haskell %{pkg_name} library
 
 %global common_description Haskell binding to the Cairo vector graphics library.
 
-%global ghc_pkg_c_deps cairo-devel%{?_isa}
-
 Name:           ghc-%{pkg_name}
-Version:        0.12.1
-Release:        1%{?dist}.2
+Version:        0.12.2
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
+# BEGIN cabal2spec
 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}
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
-BuildRequires:  hscolour
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires:  cairo-devel%{?_isa}
 BuildRequires:  gtk2hs-buildtools
-BuildRequires:  ghc-bytestring-prof, ghc-haskell98-prof, ghc-mtl-prof
+BuildRequires:  ghc-bytestring-prof
+BuildRequires:  ghc-haskell98-prof
+BuildRequires:  ghc-mtl-prof
 
 %description
 %{common_description}
@@ -39,13 +44,25 @@ BuildRequires:  ghc-bytestring-prof, ghc-haskell98-prof, ghc-mtl-prof
 %ghc_lib_install
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
-echo "%doc demo" >> %{name}-devel.files
 
 
-%ghc_lib_package
+%ghc_devel_package
+Requires: cairo-devel%{?_isa}
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files
+%doc demo
 
 
 %changelog
+* Wed Jan  4 2012 Jens Petersen <petersen at redhat.com> - 0.12.2-1
+- update to 0.12.2 and cabal2spec-0.25.2
+
 * Thu Oct 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.12.1-1.2
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index cda315f..94f5220 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b63d31dabb6af6f63c25a93d3ebffcbb  cairo-0.12.1.tar.gz
+b3583136fe84d25cd9d4f7bda3c3db0c  cairo-0.12.2.tar.gz


More information about the scm-commits mailing list