[ghc-regexpr] update to cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Wed Jan 4 14:46:53 UTC 2012


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

    update to cabal2spec-0.25.2

 ghc-regexpr.spec |   48 +++++++++++++++---------------------------------
 1 files changed, 15 insertions(+), 33 deletions(-)
---
diff --git a/ghc-regexpr.spec b/ghc-regexpr.spec
index 999e9bc..5ce3bf4 100644
--- a/ghc-regexpr.spec
+++ b/ghc-regexpr.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 regexpr
 
@@ -10,19 +10,18 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.5.4
-Release:        2%{?dist}.2
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        LGPLv3
-# 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-HUnit-prof
 BuildRequires:  ghc-mtl-prof
@@ -32,21 +31,6 @@ BuildRequires:  ghc-mtlparse-prof
 %{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}
 
@@ -59,23 +43,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
-%defattr(-,root,root,-)
-%endif
 
-%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> - 0.5.4-3
+- update to cabal2spec-0.25.2
+
 * Fri Oct 21 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.5.4-2.2
 - rebuild with new gmp without compat lib
 


More information about the scm-commits mailing list