[ghc-cryptohash] update to cabal2spec-0.25

Jens Petersen petersen at fedoraproject.org
Thu Mar 22 13:33:53 UTC 2012


commit 5efaf7cbc955ead805dc83c9eec038b15a428897
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Mar 22 22:33:37 2012 +0900

    update to cabal2spec-0.25

 ghc-cryptohash.spec |   45 +++++++++++++--------------------------------
 1 files changed, 13 insertions(+), 32 deletions(-)
---
diff --git a/ghc-cryptohash.spec b/ghc-cryptohash.spec
index 5c6b8b1..ffc4406 100644
--- a/ghc-cryptohash.spec
+++ b/ghc-cryptohash.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
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name cryptohash
 
@@ -15,7 +15,7 @@ a Haskell FFI wrapper that hide the C implementation.
 
 Name:           ghc-%{pkg_name}
 Version:        0.7.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -25,10 +25,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-bytestring-prof
 
@@ -36,21 +33,6 @@ BuildRequires:  ghc-bytestring-prof
 %{common_description}
 
 
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END cabal2spec
-# Haskell devel dependencies are autogenerated by ghc-deps.sh
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -65,24 +47,23 @@ This package contains the development files.
 rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+# devel subpackage
+%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 LICENSE
 %doc README.md
 
 
 %changelog
+* Sun Mar 18 2012 Jens Petersen <petersen at redhat.com> - 0.7.4-3
+- update to cabal2spec-0.25
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list