[ghc-X11-xft] update to new simplified Haskell Packaging Guidelines

Jens Petersen petersen at fedoraproject.org
Fri Jun 7 03:03:02 UTC 2013


commit 5ed0d415ce34ad1385b61add7dd944bd413ce13d
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jun 7 12:00:15 2013 +0900

    update to new simplified Haskell Packaging Guidelines

 ghc-X11-xft.spec |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)
---
diff --git a/ghc-X11-xft.spec b/ghc-X11-xft.spec
index 637500f..0d24be3 100644
--- a/ghc-X11-xft.spec
+++ b/ghc-X11-xft.spec
@@ -1,17 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name X11-xft
 
-%global common_summary Haskell libxft binding
-
-%global common_description Haskell bindings to Xft, X Free Type interface library,\
-and some Xrender parts.
-
 Name:           ghc-%{pkg_name}
 Version:        0.3.1
-Release:        9%{?dist}
-Summary:        %{common_summary}
+Release:        10%{?dist}
+Summary:        Haskell libXft binding
 
 # no version specified
 License:        LGPLv2+
@@ -27,7 +21,21 @@ BuildRequires:  pkgconfig(xft)
 # End cabal-rpm deps
 
 %description
-%{common_description}
+Haskell bindings to the X Free Type interface library, and some Xrender parts.
+
+
+%package devel
+Summary:        Haskell %{pkg_name} library development files
+Requires:       ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
+Requires:       %{name} = %{version}-%{release}
+# Begin cabal-rpm deps:
+Requires:       pkgconfig(xft)
+# End cabal-rpm deps
+
+%description devel
+This package provides the Haskell %{pkg_name} library development files.
 
 
 %prep
@@ -42,20 +50,26 @@ BuildRequires:  pkgconfig(xft)
 %ghc_lib_install
 
 
-%ghc_devel_package
-Requires:  libXft-devel%{?_isa}
+%post devel
+%ghc_pkg_recache
 
-%ghc_devel_description
 
+%postun devel
+%ghc_pkg_recache
 
-%ghc_devel_post_postun
 
+%files -f %{name}.files
+%doc LICENSE
 
-%ghc_files LICENSE
+
+%files devel -f %{name}-devel.files
 %doc Hello.hs
 
 
 %changelog
+* Fri Jun 07 2013 Jens Petersen <petersen at redhat.com> - 0.3.1-10
+- update to new simplified Haskell Packaging Guidelines
+
 * Fri Mar 22 2013 Jens Petersen <petersen at redhat.com> - 0.3.1-9
 - BR pkgconfig(xft)
 


More information about the scm-commits mailing list