From 314523e40b7e7105566c471fdab72cd1d3d1eebf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 06:24:14 +0000 Subject: [PATCH] - 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, ghc_pkg_deps, ghc_pkg_c_deps --- ghc-X11-xft.spec | 143 +++++++++-------------------------------------- 1 file changed, 26 insertions(+), 117 deletions(-) diff --git a/ghc-X11-xft.spec b/ghc-X11-xft.spec index 8da69d1..337cb0c 100644 --- a/ghc-X11-xft.spec +++ b/ghc-X11-xft.spec @@ -1,16 +1,23 @@ %global pkg_name X11-xft -%bcond_without doc -%bcond_without prof +%global common_summary Haskell bindings to the Xft library + +%global common_description Haskell bindings to Xft, X Free Type interface library,\ +and some Xrender parts. + +%global ghc_pkg_deps ghc-X11-devel, ghc-utf8-string-devel + +%global ghc_pkg_c_deps libXft-devel + %bcond_without shared -# ghc does not emit debug information +# debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.3 -Release: 5%{?dist} -Summary: Haskell bindings to the Xft library +Release: 6%{?dist} +Summary: %{common_summary} Group: System Environment/Libraries License: LGPLv2 @@ -18,74 +25,20 @@ URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.3.1 -BuildRequires: libXft-devel -BuildRequires: ghc-X11-devel -BuildRequires: ghc-utf8-string-devel -%if %{with doc} +BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc -BuildRequires: ghc-X11-doc -BuildRequires: ghc-utf8-string-doc -%endif -%if %{with prof} BuildRequires: ghc-prof -BuildRequires: ghc-X11-prof -BuildRequires: ghc-utf8-string-prof -%endif +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description -This package provides the Haskell %{pkg_name} library for ghc, -it includes bindings to the Xft, X Free Type interface library, -and some Xrender parts. - - -%package devel -Summary: Haskell %{pkg_name} library development files -Group: Development/Libraries -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(postun): ghc = %{ghc_version} +%{common_description} %if %{with shared} -Requires: %{name} = %{version}-%{release} -%endif -Requires: libXft-devel -Requires: ghc-X11-devel = %ghc_pkg_ver X11 -Requires: ghc-utf8-string-devel = %ghc_pkg_ver utf8-string - -%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} -Requires: ghc-X11-doc = %ghc_pkg_ver X11 -Requires: ghc-utf8-string-doc = %ghc_pkg_ver utf8-string - -%description doc -This package contains development documentation files for -the %{name} library. +This package provides the shared 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} -Requires: ghc-X11-prof = %ghc_pkg_ver X11 -Requires: ghc-utf8-string-prof = %ghc_pkg_ver utf8-string - -%description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. -%endif +%ghc_lib_package %prep @@ -93,73 +46,29 @@ built for ghc-%{ghc_version}. %build -%cabal_configure --ghc %{?with_prof:-p} +%cabal_configure --ghc -p %cabal build -%if %{with doc} %cabal haddock -%endif %install %cabal_install %cabal_pkg_conf -%ghc_gen_filelists %{name} +%ghc_gen_filelists %clean rm -rf $RPM_BUILD_ROOT -%post devel -ghc-pkg recache - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%postun devel -ghc-pkg recache - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%if %{with shared} -%files -f %{name}.files -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -%if %{without shared} -%{_docdir}/%{name}-%{version} -%endif - - -%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 - - %changelog +* Mon Jan 11 2010 Jens Petersen - 0.3-6 +- 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, ghc_pkg_deps, ghc_pkg_c_deps + * Wed Dec 23 2009 Jens Petersen - 0.3-5 - update packaging for ghc-6.12.1 - added shared library support: needs ghc-rpm-macros 0.3.1