From 56cd877ac558eb728a7a52503a7fa69e99ef4ffd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 12:55:59 +0000 Subject: [PATCH] - update to 2.2.1.5 (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_deps - build shared library - drop redundant buildroot and its install cleaning --- ghc-network.spec | 132 +++++++++++------------------------------------ 1 file changed, 31 insertions(+), 101 deletions(-) diff --git a/ghc-network.spec b/ghc-network.spec index f90b7b5..1d4ddc8 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,76 +1,41 @@ %global pkg_name network -%bcond_without doc -%bcond_without prof +%global common_summary Haskell %{pkg_name} library -# override for ghc-6.10 since it has older network in extralibs -%global ghcdocdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} +%global common_description A Haskell network library. -# ghc does not emit debug information +%global ghc_pkg_deps ghc-parsec-devel + +%bcond_without shared + +# debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2009.2.0.2 -Version: 2.2.1.4 -Release: 2%{?dist} -Summary: Haskell %{pkg_name} library +# part of haskell-platform-2009.3.1 +Version: 2.2.1.5 +Release: 1%{?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) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros -%if %{with doc} +BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc -%endif -%if %{with prof} BuildRequires: ghc-prof -%endif +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description -This package provides the Haskell %{pkg_name} library for ghc. - - -%package devel -Summary: Haskell %{pkg_name} library -Group: Development/Libraries -Provides: ghc-%{pkg_name} = %{version}-%{release} -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. +%{common_description} +%if %{with shared} +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} - -%description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. -%endif +%ghc_lib_package %prep @@ -78,67 +43,32 @@ built for ghc-%{ghc_version}. %build -%cabal_configure --ghc %{?with_prof:-p} +%cabal_configure --ghc -p %cabal build -%if %{with doc} %cabal haddock -%endif -%ghc_gen_scripts %install -rm -rf $RPM_BUILD_ROOT %cabal_install -%ghc_install_scripts -%ghc_gen_filelists %{name} +%cabal_pkg_conf + +%ghc_gen_filelists %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 - - %changelog +* Mon Jan 11 2010 Jens Petersen - 2.2.1.5-1 +- update to 2.2.1.5 (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_deps +- build shared library +- drop redundant buildroot and its install cleaning + * Tue Sep 22 2009 Jens Petersen - 2.2.1.4-2 - version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884)