[ghc-X11-xft] update to cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Fri Jan 6 04:03:01 UTC 2012


commit d36a07b705fe8e05232eb4819decc86b0b4c93a1
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 6 13:02:55 2012 +0900

    update to cabal2spec-0.25.2

 ghc-X11-xft.spec |   48 +++++++++++++++++-------------------------------
 1 files changed, 17 insertions(+), 31 deletions(-)
---
diff --git a/ghc-X11-xft.spec b/ghc-X11-xft.spec
index 70afa8d..e928e2e 100644
--- a/ghc-X11-xft.spec
+++ b/ghc-X11-xft.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name X11-xft
 
 %global common_summary Haskell bindings to the Xft library
@@ -7,7 +11,7 @@ and some Xrender parts.
 
 Name:           ghc-%{pkg_name}
 Version:        0.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -17,34 +21,17 @@ 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:  libXft-devel%{?_isa}
-BuildRequires:  ghc-X11-prof, ghc-utf8-string-prof, ghc-haskell98-prof
+BuildRequires:  ghc-X11-prof
+BuildRequires:  ghc-haskell98-prof
+BuildRequires:  ghc-utf8-string-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
-Requires:       libXft-devel%{?_isa}
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -57,23 +44,22 @@ 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
-%endif
 
-
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%ghc_files
+%doc Hello.hs
 
 
 %changelog
+* Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 0.3.1-2
+- update to cabal2spec-0.25.2
+
 * Fri Dec  2 2011 Jens Petersen <petersen at redhat.com> - 0.3.1-1
 - update to 0.3.1 and cabal2spec-0.24.1
 


More information about the scm-commits mailing list