[ghc-regex-pcre] update to cabal2spec-0.25
Jens Petersen
petersen at fedoraproject.org
Fri Mar 23 03:53:25 UTC 2012
commit 1bb18762103ee1d7b2763f9caf90b21d5b5b68f5
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Mar 23 12:53:18 2012 +0900
update to cabal2spec-0.25
ghc-regex-pcre.spec | 50 ++++++++++++++------------------------------------
1 files changed, 14 insertions(+), 36 deletions(-)
---
diff --git a/ghc-regex-pcre.spec b/ghc-regex-pcre.spec
index a3f2840..9e090f4 100644
--- a/ghc-regex-pcre.spec
+++ b/ghc-regex-pcre.spec
@@ -1,18 +1,16 @@
-# 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 regex-pcre
-# common part of summary for all the subpackages
%global common_summary Haskell PCRE binding
-# main description used for all the subpackages
%global common_description A Haskell binding to the Perl Compatible Regular Expressions library.
Name: ghc-%{pkg_name}
Version: 0.94.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -22,10 +20,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: pcre-devel
BuildRequires: ghc-regex-base-prof
@@ -34,23 +29,6 @@ BuildRequires: ghc-regex-base-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
-Requires: pcre-devel
-# 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}
@@ -63,23 +41,23 @@ This package contains the development files.
%ghc_lib_install
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+# devel subpackage
+%ghc_devel_package
+Requires: pcre-devel%{?_isa}
+%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.94.2-5
+- update to cabal2spec-0.25
+
* Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 0.94.2-4
- Rebuild against PCRE 8.30
More information about the scm-commits
mailing list