rpms/ghc-zlib/F-11 ghc-zlib.spec,1.10,1.11

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ghc-zlib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14258

Modified Files:
	ghc-zlib.spec 
Log Message:
backport from devel for ghc-6.10.3 rebuild


Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/F-11/ghc-zlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ghc-zlib.spec	27 Feb 2009 06:21:43 -0000	1.10
+++ ghc-zlib.spec	30 May 2009 10:08:40 -0000	1.11
@@ -1,8 +1,4 @@
 %global pkg_name zlib
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -11,8 +7,9 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform
 Version:        0.5.0.0
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Haskell compression and decompression library binding
 
 Group:          Development/Libraries
@@ -22,12 +19,12 @@ Source0:         http://hackage.haskell.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+BuildRequires:  ghc, ghc-rpm-macros
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 BuildRequires:  zlib-devel
 
@@ -56,9 +53,9 @@ built for ghc-%{ghc_version}.
 
 %if %{with doc}
 %package doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Summary:        Documentation for %{name}
+Group:          Development/Libraries
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
@@ -69,13 +66,14 @@ This package contains development docume
 
 %if %{with prof}
 %package prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+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}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -84,7 +82,7 @@ This package contains profiling librarie
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -98,9 +96,6 @@ rm -rf $RPM_BUILD_ROOT
 %ghc_install_scripts
 %ghc_gen_filelists %{name}
 
-# no base package
-#rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/LICENSE
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -136,9 +131,8 @@ fi
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -149,6 +143,12 @@ fi
 
 
 %changelog
+* Sat May 16 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-9
+- buildrequires ghc-rpm-macros (cabal2spec-0.16)
+
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-8
+- sync with cabal2spec-0.14
+
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-7
 - update to cabal2spec-0.11:
 - add devel subpackage