From 80120f7953affe7941b595c473bdc4207d19e2f4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 22 Mar 2012 18:20:34 +0900 Subject: [PATCH] update to cabal2spec-0.25 --- ghc-bytestring-trie.spec | 54 ++++++++++++---------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/ghc-bytestring-trie.spec b/ghc-bytestring-trie.spec index 3118f94..4e88f84 100644 --- a/ghc-bytestring-trie.spec +++ b/ghc-bytestring-trie.spec @@ -1,6 +1,6 @@ -# 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 bytestring-trie @@ -15,20 +15,18 @@ but they're also quick for lookups and insertions. Name: ghc-%{pkg_name} Version: 0.2.3 -Release: 7%{?dist}.2 +Release: 8%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD -# BEGIN: cabal2spec-0.24 +# 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 -BuildRequires: hscolour -# END: cabal2spec-0.24 - +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel @@ -36,23 +34,6 @@ BuildRequires: ghc-bytestring-devel %{common_description} -%package -n ghc-%{pkg_name}-devel -Summary: Development files for %{common_summary} -Group: Development/Libraries -# BEGIN: cabal2spec-0.24 -%{?ghc_devel_requires} -Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} -Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END: cabal2spec-0.24 -# remember to require any C devel dependency here -# 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} @@ -65,25 +46,22 @@ This package contains the development files. %ghc_lib_install -%post -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +# devel subpackage +%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 -%defattr(-,root,root,-) -%endif - - -%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files -%defattr(-,root,root,-) +%ghc_files LICENSE %changelog +* Sun Mar 18 2012 Jens Petersen - 0.2.3-8 +- update to cabal2spec-0.25 + * Fri Jan 13 2012 Fedora Release Engineering - 0.2.3-7.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild