[haddock] update to cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Thu Jan 5 07:50:56 UTC 2012


commit a42e070fb4455a6dde391eb1fceaeca0ef7def27
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Jan 5 16:50:49 2012 +0900

    update to cabal2spec-0.25.2

 haddock.spec |   82 ++++++++++++++++-----------------------------------------
 1 files changed, 23 insertions(+), 59 deletions(-)
---
diff --git a/haddock.spec b/haddock.spec
index 92acc47..be092d9 100644
--- a/haddock.spec
+++ b/haddock.spec
@@ -1,18 +1,16 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name haddock
 
-# common part of summary for all the subpackages
 %global common_summary Haskell documentation tool
 
-# main description used for all the subpackages
 %global common_description A documentation-generation tool for Haskell libraries.
 
 Name:           %{pkg_name}
 Version:        2.9.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Haskell %{pkg_name}
 
 Group:          Development/Tools
@@ -22,54 +20,18 @@ URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{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:  ghc-ghc-paths-prof, ghc-ghc-prof, ghc-xhtml-prof
-BuildRequires:  alex, happy
+BuildRequires:  ghc-ghc-paths-prof,
+BuildRequires:  ghc-ghc-prof
+BuildRequires:  ghc-xhtml-prof
+BuildRequires:  alex
+BuildRequires:  happy
 
 %description
 %{common_description}
 
 
-%if %{undefined ghc_without_shared}
-%package -n ghc-%{pkg_name}
-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}
-%{common_description}
-
-This package contains the shared library.
-%endif
-
-
-%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
 
@@ -85,30 +47,32 @@ This package contains the development files.
 mv $RPM_BUILD_ROOT%{_bindir}/%{name}{,-%{version}}
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_package
+
+%ghc_description
+
 
+%ghc_devel_package
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
 
 
 %files
-%defattr(-,root,root,-)
 %doc README LICENSE
 %{_bindir}/%{name}-%{version}
 %{_datadir}/%{name}-%{version}
 
 
-%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
 
 
 %changelog
+* Thu Jan  5 2012 Jens Petersen <petersen at redhat.com> - 2.9.2-5
+- update to cabal2spec-0.25.2
+
 * Mon Jan 2 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 2.9.2-4
 - rebuild with new ghc-xhtml
 


More information about the scm-commits mailing list