rpms/ghc-editline/devel ghc-editline.spec,1.11,1.12

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-editline.spec 
Log Message:
- build for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1




Index: ghc-editline.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-editline/devel/ghc-editline.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ghc-editline.spec	24 Sep 2009 04:05:36 -0000	1.11
+++ ghc-editline.spec	22 Dec 2009 09:40:47 -0000	1.12
@@ -2,6 +2,7 @@
 
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
@@ -12,14 +13,14 @@ Version:        0.2.1.0
 Release:        11%{?dist}
 Summary:        Haskell %{pkg_name} library
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.haskell.org/editline
 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
 BuildRequires:  libedit-devel
 %if %{with doc}
 BuildRequires:  ghc-doc
@@ -37,11 +38,14 @@ Additionally, a readline compatibility m
 provides a subset of the functionality of the readline library.
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries
 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
 Requires:       libedit-devel
 
 %description devel
@@ -85,13 +89,13 @@ 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}
 
 
@@ -100,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -109,10 +113,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}
@@ -123,9 +125,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}
@@ -140,6 +151,10 @@ fi
 %endif
 
 %Changelog
+* Tue Dec 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1.0-11
+- build for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
 * Wed Sep 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.1.0-11
 - sync with current cabal2spec template to minimise cabal2spec-diff
   - fixes uninstall error