From 9dedaa43f6d788bea60d52fac29250eddbf94a6f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Apr 24 2009 13:44:58 +0000 Subject: sync with cabal2spec-0.14 --- diff --git a/ghc-zlib.spec b/ghc-zlib.spec index d4ed151..2e188a6 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -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 @@ -12,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.5.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Haskell compression and decompression library binding Group: Development/Libraries @@ -22,12 +18,13 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versi BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc = %{ghc_version} +# for latest macros.ghc +BuildRequires: ghc >= 6.10.2-3 %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 documentation files for the %{name} library. %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 libraries for %{name}. %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,9 @@ fi %changelog +* Fri Apr 24 2009 Jens Petersen - 0.5.0.0-8 +- sync with cabal2spec-0.14 + * Fri Feb 27 2009 Jens Petersen - 0.5.0.0-7 - update to cabal2spec-0.11: - add devel subpackage