[ghc-pcre-light/f16] Revert last "update to cabal2spec-0.25.2" intended for master branch

Jens Petersen petersen at fedoraproject.org
Fri Jan 6 09:49:52 UTC 2012


commit f7460f241ab4fbfed5b836c861a93ee7ce4f09ba
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 6 18:49:40 2012 +0900

    Revert last "update to cabal2spec-0.25.2" intended for master branch

 ghc-pcre-light.spec |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 deletions(-)
---
diff --git a/ghc-pcre-light.spec b/ghc-pcre-light.spec
index d8b0f84..90325f1 100644
--- a/ghc-pcre-light.spec
+++ b/ghc-pcre-light.spec
@@ -1,7 +1,3 @@
-# cabal2spec-0.25.2
-# https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
-
 %global pkg_name pcre-light
 
 %global common_summary Perl5 compatible regular expressions library
@@ -13,21 +9,22 @@ The PCRE library is a set of functions that implement regular\
 expression pattern matching using the same syntax and\
 semantics as Perl 5.
 
+%global ghc_pkg_c_deps pcre-devel
+
 Name:           ghc-%{pkg_name}
 Version:        0.4
-Release:        5%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
-# 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 %{!?without_hscolour:hscolour}
-# END cabal2spec
-BuildRequires:  pcre-devel%{?_isa}
+BuildRequires:  ghc-rpm-macros
+BuildRequires:  hscolour
+%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 BuildRequires:  ghc-bytestring-prof
 
 %description
@@ -46,22 +43,10 @@ BuildRequires:  ghc-bytestring-prof
 %ghc_lib_install
 
 
-%ghc_devel_package
-Requires:  pcre-devel%{?_isa}
-
-%ghc_devel_description
-
-
-%ghc_devel_post_postun
-
-
-%ghc_files
+%ghc_lib_package
 
 
 %changelog
-* Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 0.4-5
-- update to cabal2spec-0.25.2
-
 * Mon Jun 27 2011 Jens Petersen <petersen at redhat.com> - 0.4-4
 - use ghc_arches (cabal2spec-0.23.2)
 


More information about the scm-commits mailing list