[ghc-colour] update to 2.3.2 and cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Wed Jan 4 13:47:20 UTC 2012


commit 20aafce0f969d14f253b92efda037aa4d84e559a
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jan 4 22:47:14 2012 +0900

    update to 2.3.2 and cabal2spec-0.25.2

 .gitignore      |    1 +
 ghc-colour.spec |   48 +++++++++++++++---------------------------------
 sources         |    2 +-
 3 files changed, 17 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79c1b47..e78d962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /colour-2.3.1.tar.gz
+/colour-2.3.2.tar.gz
diff --git a/ghc-colour.spec b/ghc-colour.spec
index 261d964..cb70564 100644
--- a/ghc-colour.spec
+++ b/ghc-colour.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 colour
 
@@ -12,8 +12,8 @@ color spaces are supported. A module of color names \
 ("Data.Colour.Names") is provided.
 
 Name:           ghc-%{pkg_name}
-Version:        2.3.1
-Release:        11%{?dist}.2
+Version:        2.3.2
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -23,10 +23,7 @@ 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
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
 BuildRequires:  ghc-base-prof
 
@@ -34,21 +31,6 @@ BuildRequires:  ghc-base-prof
 %{common_description}
 
 
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END cabal2spec
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -63,22 +45,22 @@ This package contains the development files.
 rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG}
 
 
-%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
-%endif
+%ghc_devel_post_postun
 
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
-%doc README CHANGELOG
+
+%ghc_files
+%doc CHANGELOG README
 
 
 %changelog
+* Wed Jan  4 2012 Jens Petersen <petersen at redhat.com> - 2.3.2-1
+- update to 2.3.2 and cabal2spec-0.25.2
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 2.3.1-11.2
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index e48a9da..c117ea2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5edced36d4c27393ae1ce1389eeb25ad  colour-2.3.1.tar.gz
+2488e192e22c13073c4ac48cedb1e07c  colour-2.3.2.tar.gz


More information about the scm-commits mailing list