[ghc-hamlet] update to 0.10.6 and cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Thu Jan 5 13:48:02 UTC 2012


commit 7cfa4feac73e85474501808ea133755c4bec0328
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Jan 5 22:47:57 2012 +0900

    update to 0.10.6 and cabal2spec-0.25.2

 .gitignore      |    1 +
 ghc-hamlet.spec |   48 +++++++++++++-----------------------------------
 sources         |    2 +-
 3 files changed, 15 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d4a432..c757cd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /hamlet-0.9.0.tar.gz
 /hamlet-0.10.3.tar.gz
 /hamlet-0.10.4.tar.gz
+/hamlet-0.10.6.tar.gz
diff --git a/ghc-hamlet.spec b/ghc-hamlet.spec
index 6814cf7..f8e80ca 100644
--- a/ghc-hamlet.spec
+++ b/ghc-hamlet.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 hamlet
 
@@ -14,7 +14,7 @@ errors. Please see the documentation at \
 <http://docs.yesodweb.com/hamlet/> for more details.
 
 Name:           ghc-%{pkg_name}
-Version:        0.10.4
+Version:        0.10.6
 Release:        1%{?dist}
 Summary:        %{common_summary}
 
@@ -23,14 +23,9 @@ 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}
-# ppc64 not bootstrapped for Template Haskell
-ExcludeArch:    ppc64
+ExclusiveArch:  %{ghc_arches_with_ghci}
 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-blaze-builder-prof
 BuildRequires:  ghc-blaze-html-prof
@@ -47,21 +42,6 @@ BuildRequires:  ghc-text-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}
 
@@ -74,23 +54,21 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_package
 
+%ghc_devel_description
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
 
+%ghc_devel_post_postun
 
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%endif
 
-
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%ghc_files
 
 
 %changelog
+* Thu Jan  5 2012 Jens Petersen <petersen at redhat.com> - 0.10.6-1
+- update to 0.10.6 and cabal2spec-0.25.2
+
 * Tue Nov  1 2011 Jens Petersen <petersen at redhat.com> - 0.10.4-1
 - update to 0.10.4
 
diff --git a/sources b/sources
index 5f75574..3abd52d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5073f0d0bb6edcfefae427640e4e9d1f  hamlet-0.10.4.tar.gz
+ecb54d7091cd51d176505e6c6f341881  hamlet-0.10.6.tar.gz


More information about the scm-commits mailing list