rpms/hscolour/devel hscolour.spec,1.5,1.6

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/hscolour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22787

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




Index: hscolour.spec
===================================================================
RCS file: /cvs/extras/rpms/hscolour/devel/hscolour.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hscolour.spec	18 Sep 2009 00:55:12 -0000	1.5
+++ hscolour.spec	22 Dec 2009 15:35:04 -0000	1.6
@@ -1,22 +1,22 @@
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           hscolour
 Version:        1.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Colourizes Haskell code
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.cs.york.ac.uk/fp/darcs/hscolour/
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{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
@@ -30,12 +30,25 @@ It currently has five output formats: AN
 HTML 3.2 with font tags, HTML 4.01 with CSS, LaTeX, and mIRC chat codes.
 
 
+%if %{with shared}
+%package -n ghc-%{name}
+Summary:        Haskell library for %{name}
+Group:          System Environment/Libraries
+
+%description -n ghc-%{name}
+Haskell %{name} library for ghc.
+%endif
+
+
 %package -n ghc-%{name}-devel
-Summary:        Haskell %{name} library
+Summary:        Haskell %{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
 
 %description -n ghc-%{name}-devel
 This package contains the development files for %{name}
@@ -44,9 +57,9 @@ built for ghc-%{ghc_version}.
 
 %if %{with doc}
 %package -n ghc-%{name}-doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Summary:        Documentation for %{name}
+Group:          Development/Libraries
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
@@ -57,10 +70,11 @@ This package contains development docume
 
 %if %{with prof}
 %package -n ghc-%{name}-prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: ghc-%{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+Summary:        Profiling libraries for %{name}
+Group:          Development/Libraries
+License:        LGPLv2+
+Requires:       ghc-%{name}-devel = %{version}-%{release}
+Requires:       ghc-prof = %{ghc_version}
 
 %description -n ghc-%{name}-prof
 This package contains profiling libraries for %{name}
@@ -73,18 +87,18 @@ built for ghc-%{ghc_version}.
 
 
 %build
+# dynamic + prof breaks cabal looking for p_dyn
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %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 ghc-%{name}
 
 
@@ -93,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -n ghc-%{name}-devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -103,9 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %preun -n ghc-%{name}-devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -118,12 +130,23 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENCE-GPL README
+%doc README
 %attr(755,root,root) %{_bindir}/HsColour
 %{_datadir}/%{name}-%{version}
 
+
+%if %{with shared}
+%files -n ghc-%{name} -f ghc-%{name}.files
+%defattr(-,root,root,-)
+%doc LICENCE-GPL
+%endif
+
+
 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
+%doc LICENCE-LGPL
+%endif
 
 
 %if %{with doc}
@@ -139,6 +162,10 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.15-2
+- update spec for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
 * Fri Sep 18 2009 Jens Petersen <petersen at redhat.com> - 1.15-1
 - update to 1.15