[ghc-editline] update to cabal2spec-0.25

Jens Petersen petersen at fedoraproject.org
Thu Mar 22 13:48:21 UTC 2012


commit e4fce809e2f05de2c44e3ee656b0846d67e50837
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Mar 22 22:48:16 2012 +0900

    update to cabal2spec-0.25

 ghc-editline.spec |   46 +++++++++++++++-------------------------------
 1 files changed, 15 insertions(+), 31 deletions(-)
---
diff --git a/ghc-editline.spec b/ghc-editline.spec
index f271c02..7add173 100644
--- a/ghc-editline.spec
+++ b/ghc-editline.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name editline
 
 %global common_summary Haskell %{pkg_name} library
@@ -16,15 +20,12 @@ Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://code.haskell.org/editline
 # 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
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
 BuildRequires:  libedit-devel%{?_isa}
 BuildRequires:  ghc-base-prof
@@ -33,23 +34,6 @@ BuildRequires:  ghc-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:       libedit-devel%{?_isa}
-# 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}
 
@@ -62,23 +46,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:       libedit-devel%{?_isa}
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_description
 
 
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%endif
+%ghc_devel_post_postun
 
 
-%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.1.0-26
+- update to cabal2spec-0.25
+
 * Wed Oct 26 2011 Jens Petersen <petersen at redhat.com> - 0.2.1.0-25
 - update to cabal2spec-0.24.1
 - use _isa for libedit dependency


More information about the scm-commits mailing list