rpms/ghc-time/devel ghc-time.spec,1.1,1.2

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc-time/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2197

Modified Files:
	ghc-time.spec 
Log Message:
- update packaging for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1
- note part of haskell-platform




Index: ghc-time.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-time/devel/ghc-time.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-time.spec	28 Sep 2009 00:22:37 -0000	1.1
+++ ghc-time.spec	22 Dec 2009 16:29:47 -0000	1.2
@@ -2,26 +2,24 @@
 
 %bcond_without doc
 %bcond_without prof
-
-# override for ghc-6.10 since it has older time in extralibs
-%global ghcdocdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform-2009.2.0.2
 Version:        1.1.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Haskell %{pkg_name} library
 
-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
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -34,12 +32,14 @@ This package provides the Haskell %{pkg_
 
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries
-Provides:       ghc-%{pkg_name} = %{version}-%{release}
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 
 %description devel
 This package contains the development files for %{name}
@@ -82,13 +82,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -97,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -106,10 +105,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -120,9 +117,18 @@ 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}
@@ -138,6 +144,11 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.1.2.4-3
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+- note part of haskell-platform
+
 * Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 1.1.2.4-2
 - version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884)