[ghc-MonadCatchIO-transformers] update to cabal2spec-0.25
Jens Petersen
petersen at fedoraproject.org
Thu Mar 22 07:50:43 UTC 2012
commit cc52cf562fd6a0fae3f2aeeb87d396c4a69e85d1
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Mar 22 16:50:37 2012 +0900
update to cabal2spec-0.25
ghc-MonadCatchIO-transformers.spec | 45 ++++++++++-------------------------
1 files changed, 13 insertions(+), 32 deletions(-)
---
diff --git a/ghc-MonadCatchIO-transformers.spec b/ghc-MonadCatchIO-transformers.spec
index 5d12872..4af2e49 100644
--- a/ghc-MonadCatchIO-transformers.spec
+++ b/ghc-MonadCatchIO-transformers.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 MonadCatchIO-transformers
@@ -14,7 +14,7 @@ by creating an instance of the MonadCatchIO class.
Name: ghc-%{pkg_name}
Version: 0.2.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -24,10 +24,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-extensible-exceptions-prof, ghc-transformers-prof
@@ -35,21 +32,6 @@ BuildRequires: ghc-extensible-exceptions-prof, ghc-transformers-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,23 +47,22 @@ sed -i 's/\r//' LICENSE
%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.2.2.3-4
+- update to cabal2spec-0.25
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list