[ghc-xml] update to 1.3.10 and cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Wed Jan 4 08:35:32 UTC 2012


commit c9c0748dfc48ef1b4642c958cb43904e13d1259b
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jan 4 17:35:24 2012 +0900

    update to 1.3.10 and cabal2spec-0.25.2

 .gitignore   |    1 +
 ghc-xml.spec |   51 ++++++++++++++++-----------------------------------
 sources      |    2 +-
 3 files changed, 18 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 934ea94..e6726df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /xml-1.3.7.tar.gz
 /xml-1.3.8.tar.gz
 /xml-1.3.9.tar.gz
+/xml-1.3.10.tar.gz
diff --git a/ghc-xml.spec b/ghc-xml.spec
index 333f155..325903a 100644
--- a/ghc-xml.spec
+++ b/ghc-xml.spec
@@ -1,6 +1,6 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name xml
 
@@ -9,42 +9,25 @@
 %global common_description A simple XML library.
 
 Name:           ghc-%{pkg_name}
-Version:        1.3.9
-Release:        1%{?dist}.3
+Version:        1.3.10
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
-# BEGIN: cabal2spec-0.24
+# 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
-# END: cabal2spec-0.24
-
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
 BuildRequires:  ghc-bytestring-devel
 
 %description
 %{common_description}
 
 
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-# BEGIN: cabal2spec-0.24
-%{?ghc_devel_requires}
-Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END: cabal2spec-0.24
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -57,23 +40,21 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_package
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_description
 
 
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%defattr(-,root,root,-)
-%endif
+%ghc_devel_post_postun
 
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
-%defattr(-,root,root,-)
+
+%ghc_files
 
 
 %changelog
+* Wed Jan  4 2012 Jens Petersen <petersen at redhat.com> - 1.3.10-1
+- update to 1.3.10 and cabal2spec-0.25.2
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.3.9-1.3
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index a0e7417..5d442ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f84a14825751c865e1463c05cc5c456a  xml-1.3.9.tar.gz
+b47371c14455382429a1163a69e17931  xml-1.3.10.tar.gz


More information about the scm-commits mailing list