[ghc-zlib/el6/master] update to f14 package

Mon Oct 4 00:50:50 UTC 2010

commit 20943f012aea8a4acfc8b250d27167a5dc315b92
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Oct 4 10:50:43 2010 +1000

    update to f14 package

 .gitignore    |    2 +-
 ghc-zlib.spec |  179 ++++++++++++++++++++++-----------------------------------
 sources       |    2 +-
 3 files changed, 70 insertions(+), 113 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 74089ad..7ee0efb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-zlib-0.5.0.0.tar.gz
+zlib-0.5.2.0.tar.gz
diff --git a/ghc-zlib.spec b/ghc-zlib.spec
index 064b64e..9ae1310 100644
--- a/ghc-zlib.spec
+++ b/ghc-zlib.spec
@@ -1,79 +1,48 @@
 %global pkg_name zlib
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell compression and decompression library
+
+%global common_description This package provides a pure Haskell interface for compressing and\
+decompressing streams of data represented as lazy ByteStrings. It uses\
+the zlib C library so it has high performance. It supports the "zlib",\
+"gzip" and "raw" compression formats.\
+\
+It provides a convenient high level API suitable for most tasks.  For\
+the few cases where more control is needed, it provides access to the\
+full zlib feature set.
+
+%global ghc_pkg_c_deps zlib-devel
 
-# ghc does not emit debug information
+%bcond_without shared
+%bcond_without hscolour
+
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2009.2.0.2
-Version:        0.5.0.0
-Release:        10%{?dist}
-Summary:        Haskell compression and decompression library binding
+# part of haskell-platform-2010.2.0.0
+Version:        0.5.2.0
+Release:        4%{?dist}
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
-Source0:         http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
-%if %{with doc}
-BuildRequires:  ghc-doc
-%endif
-%if %{with prof}
-BuildRequires:  ghc-prof
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires:  hscolour
 %endif
-BuildRequires:  zlib-devel
+%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 
 %description
-This package provides a pure Haskell interface for compressing and
-decompressing streams of data represented as lazy ByteStrings. It uses
-the zlib C library so it has high performance. It supports the "zlib",
-"gzip" and "raw" compression formats.
-
-It provides a convenient high level API suitable for most tasks.  For
-the few cases where more control is needed, it provides access to the
-full zlib feature set.
-
-%package devel
-Summary:        Haskell %{pkg_name} library
-Group:          Development/Libraries
-Requires:       zlib-devel
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
-
-%description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
-
-
-%if %{with doc}
-%package doc
-Summary:        Documentation for %{name}
-Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
-
-%description doc
-This package contains development documentation files for the %{name} library.
-%endif
-
-
-%if %{with prof}
-%package prof
-Summary:        Profiling libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
-
-%description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
 %endif
 
 
@@ -82,67 +51,55 @@ built for ghc-%{ghc_version}.
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
-%cabal build
-%if %{with doc}
-%cabal haddock
-%endif
-%ghc_gen_scripts
+%ghc_lib_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists %{name}
+%ghc_lib_install
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post devel
-%ghc_register_pkg
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
-
-
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
-
-
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
+%ghc_lib_package -o 0.5.2.0-4
 
 
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 0.5.2.0-4
+- add hscolour and doc obsolete (cabal2spec-0.22.2)
+- part of haskell-platform-2010.2.0.0
+
+* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 0.5.2.0-3
+- sync cabal2spec-0.22
+
+* Sat Apr 24 2010 Jens Petersen <petersen at redhat.com> - 0.5.2.0-2
+- part of haskell-platform-2010.1.0.0
+- rebuild against ghc-6.12.2
+
+* Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 0.5.2.0-1
+- update to 0.5.2.0 (haskell-platform-2009.3.1)
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use common summary and common_description
+- use ghc_lib_package and ghc_pkg_c_deps
+
+* Sat Dec 26 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-12
+- update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0:
+- use common_summary and common_description
+- reenable debuginfo for stripping
+- use ghc_requires, ghc_doc_requires, and ghc_prof_requires
+
+* Tue Dec 22 2009 Jens Petersen <petersen at redhat.com>
+- fix base Group and devel Summary
+- only include docdir in devel if not shared build
+
+* Wed Dec 16 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-11
+- build for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+- use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -157,7 +114,7 @@ fi
 - add devel subpackage
 - use ix86 macro for archs and add alpha
 - use global rather than define
-- make devel own docdir for now
+- make devel subpackage own docdir for now
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/sources b/sources
index c23291d..229af08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22fa6d394c42c8584b234799b923f860  zlib-0.5.0.0.tar.gz
+19859e241dc18ef1501a5d44d8523507  zlib-0.5.2.0.tar.gz
