[ghc-unix-compat] update to cabal2spec-0.25

Jens Petersen petersen at fedoraproject.org
Fri Mar 23 05:34:38 UTC 2012


commit 4e39924181d285cc516868044e4b2264c0376ec4
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Mar 23 14:34:28 2012 +0900

    update to cabal2spec-0.25

 ghc-unix-compat.spec |   50 +++++++++++++++-----------------------------------
 1 files changed, 15 insertions(+), 35 deletions(-)
---
diff --git a/ghc-unix-compat.spec b/ghc-unix-compat.spec
index 99c236c..33a50fc 100644
--- a/ghc-unix-compat.spec
+++ b/ghc-unix-compat.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 unix-compat
 
@@ -15,7 +15,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -25,34 +25,15 @@ 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-unix-prof, ghc-directory-prof
+BuildRequires:  ghc-unix-prof
+BuildRequires:  ghc-directory-prof
 
 %description
 %{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
-# remember to require any C devel dependency here
-# 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,23 +46,22 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%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
 
 
 %changelog
+* Sun Mar 18 2012 Jens Petersen <petersen at redhat.com> - 0.3.0.1-2
+- update to cabal2spec-0.25
+
 * Thu Jan 19 2012 Lakshmi Narasimhan <lakshminaras2002 at gmail.com> - 0.3.0.1-1
 - Upgrade to version 0.3.0.1
 


More information about the scm-commits mailing list