[ghc-ltk] update to cabal2spec-0.25

Jens Petersen petersen at fedoraproject.org
Thu Mar 22 14:37:48 UTC 2012


commit 6bde54bf29360a6c55033d2a8efc50c900550944
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Mar 22 23:37:40 2012 +0900

    update to cabal2spec-0.25

 ghc-ltk.spec |   51 ++++++++++++++++-----------------------------------
 1 files changed, 16 insertions(+), 35 deletions(-)
---
diff --git a/ghc-ltk.spec b/ghc-ltk.spec
index d31e4e0..9061335 100644
--- a/ghc-ltk.spec
+++ b/ghc-ltk.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 ltk
 
@@ -12,7 +12,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.12.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -23,34 +23,15 @@ 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
-# macros for building haskell packages
-BuildRequires:  ghc-rpm-macros
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
-# BR any C devel dependency here
-# list ghc-*-prof dependencies:
-BuildRequires:  ghc-glib-prof, ghc-gtk-prof, ghc-mtl-prof, ghc-parsec-prof, ghc-haddock-prof
+BuildRequires:  ghc-gtk-prof
+BuildRequires:  ghc-haddock-prof
+BuildRequires:  ghc-parsec-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
-# 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}
@@ -64,22 +45,22 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+# devel subpackage
+%ghc_devel_package
 
-%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.12.0.0-2
+- update to cabal2spec-0.25
+
 * Mon Mar 12 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.0.0-1
 - package update to 0.12.0.0
 


More information about the scm-commits mailing list