Author: petersen
Update of /cvs/pkgs/rpms/ghc-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14202
Modified Files:
.cvsignore ghc-zlib.spec sources
Log Message:
- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 28 Nov 2008 01:12:47 -0000 1.2
+++ .cvsignore 11 Jan 2010 04:50:30 -0000 1.3
@@ -1 +1 @@
-zlib-0.5.0.0.tar.gz
+zlib-0.5.2.0.tar.gz
Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/ghc-zlib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ghc-zlib.spec 25 Dec 2009 15:39:20 -0000 1.18
+++ ghc-zlib.spec 11 Jan 2010 04:50:30 -0000 1.19
@@ -11,17 +11,17 @@ It provides a convenient high level API
the few cases where more control is needed, it provides access to the\
full zlib feature set.
-%bcond_without doc
-%bcond_without prof
+%global ghc_pkg_c_deps zlib-devel
+
%bcond_without shared
-# stripping produces smaller .so
-#%%global debug_package %{nil}
+# 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: 12%{?dist}
+# part of haskell-platform-2009.3.1
+Version: 0.5.2.0
+Release: 1%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -30,14 +30,11 @@ URL: http://hackage.haskell.o
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.4.0
-%if %{with doc}
+BuildRequires: ghc, ghc-rpm-macros >= 0.5.1
BuildRequires: ghc-doc
-%endif
-%if %{with prof}
BuildRequires: ghc-prof
-%endif
-BuildRequires: zlib-devel
+%{?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
%{common_description}
@@ -46,42 +43,7 @@ This package provides the shared library
%endif
-%package devel
-Summary: %{common_summary} development files
-Group: Development/Libraries
-%{?ghc_requires}
-Requires: zlib-devel
-
-%description devel
-%{common_description}
-
-This package contains the development files.
-
-
-%if %{with doc}
-%package doc
-Summary: Documentation for %{common_summary}
-Group: Development/Libraries
-%{?ghc_doc_requires}
-
-%description doc
-%{common_description}
-
-This package contains development documentation files.
-%endif
-
-
-%if %{with prof}
-%package prof
-Summary: Profiling libraries for %{common_summary}
-Group: Development/Libraries
-%{?ghc_prof_requires}
-
-%description prof
-%{common_description}
-
-This package contains the profiling library.
-%endif
+%ghc_lib_package
%prep
@@ -89,73 +51,29 @@ This package contains the profiling libr
%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 <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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 28 Nov 2008 01:12:47 -0000 1.2
+++ sources 11 Jan 2010 04:50:30 -0000 1.3
@@ -1 +1 @@
-22fa6d394c42c8584b234799b923f860 zlib-0.5.0.0.tar.gz
+19859e241dc18ef1501a5d44d8523507 zlib-0.5.2.0.tar.gz