[ghc-hakyll] update to 3.2.3.2 and cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Fri Jan 6 13:01:13 UTC 2012


commit 5790414f24cb117e505e8cbc415c78f7734af9ef
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 6 22:01:07 2012 +0900

    update to 3.2.3.2 and cabal2spec-0.25.2

 .gitignore      |    1 +
 ghc-hakyll.spec |   53 +++++++++++++++--------------------------------------
 sources         |    2 +-
 3 files changed, 17 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f177e8..a62da3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /hakyll-3.2.0.10.tar.gz
+/hakyll-3.2.3.2.tar.gz
diff --git a/ghc-hakyll.spec b/ghc-hakyll.spec
index 35ef307..6b9f0e9 100644
--- a/ghc-hakyll.spec
+++ b/ghc-hakyll.spec
@@ -1,19 +1,17 @@
-# 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 hakyll
 
-# common part of summary for all the subpackages
 %global common_summary Static website compiler Haskell library
 
-# main description used for all the subpackages
 %global common_description Hakyll is a static website compiler library.\
 It provides you with the tools to create a simple or advanced static website\
 using a Haskell DSL and formats such as markdown or RST.
 
 Name:           ghc-%{pkg_name}
-Version:        3.2.0.10
+Version:        3.2.3.2
 Release:        1%{?dist}
 Summary:        %{common_summary}
 
@@ -24,11 +22,9 @@ 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:  ghc-citeproc-hs-prof
 BuildRequires:  ghc-cryptohash-prof
 BuildRequires:  ghc-directory-prof
 BuildRequires:  ghc-filepath-prof
@@ -43,21 +39,6 @@ BuildRequires:  ghc-unix-prof
 %{common_description}
 
 
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END cabal2spec
-# 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}
 
@@ -68,29 +49,25 @@ This package contains the development files.
 
 %install
 %ghc_lib_install
+%ghc_add_basepkg_file %{_datadir}/%{pkg_name}-%{version}
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%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
-%{_datadir}/%{pkg_name}-%{version}
-%endif
 
-
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
-%if %{defined ghc_without_shared}
-%{_datadir}/%{pkg_name}-%{version}
-%endif
+%ghc_files
 
 
 %changelog
+* Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 3.2.3.2-1
+- update to 3.2.3.2 and cabal2spec-0.25.2
+- use ghc_add_basepkg_file
+
 * Mon Nov  7 2011 Jens Petersen <petersen at redhat.com> - 3.2.0.10-1
 - BSD license, deps, and description
 
diff --git a/sources b/sources
index 3cef85a..e874b7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5580221bad36fd7adfb5e50639107d1  hakyll-3.2.0.10.tar.gz
+5734ef609e85f0d092abac7203eaa847  hakyll-3.2.3.2.tar.gz


More information about the scm-commits mailing list