rpms/ghc/F-9 ghc-rpm-macros.ghc,1.3,1.4 ghc.spec,1.39,1.40

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4480

Modified Files:
	ghc-rpm-macros.ghc ghc.spec 
Log Message:
backport latest macros.ghc:

* Mon Dec  1 2008 Jens Petersen <petersen at redhat.com>
- update macros.ghc to latest proposed revised packaging guidelines:
  - use runghc
  - drop trivial cabal_build and cabal_haddock macros
  - ghc_register_pkg and ghc_unregister_pkg replace ghc_preinst_script,
    ghc_postinst_script, ghc_preun_script, and ghc_postun_script
- ghc-prof does not need to own libraries dirs owned by main package




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-9/ghc-rpm-macros.ghc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghc-rpm-macros.ghc	3 Nov 2008 07:11:45 -0000	1.3
+++ ghc-rpm-macros.ghc	13 Feb 2009 00:59:15 -0000	1.4
@@ -1,60 +1,31 @@
-%cabal %{_bindir}/runhaskell Setup
+%cabal %{_bindir}/runghc Setup
 
 %cabal_configure \
 %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{pkg_docdir} --libsubdir='$compiler/$pkgid'
 
-%cabal_build \
-%cabal build \
-%{nil}
-
 %cabal_makefile \
 %cabal makefile -f cabal-rpm.mk \
 make -f cabal-rpm.mk %{_smp_mflags} \
 %{nil}
 
-%cabal_haddock \
-%cabal haddock \
-%{nil}
-
-%cabal_install \
-%cabal copy --destdir=${RPM_BUILD_ROOT} -v \
-%{nil}
+%cabal_install %cabal copy --destdir=${RPM_BUILD_ROOT} -v
 
 %ghc_gen_filelists() \
 rm -f %1.files %1-prof.files \
-echo '%defattr(-,root,root,-)' > %1-prof.files \
-find ${RPM_BUILD_ROOT}%{pkg_libdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \
 echo '%defattr(-,root,root,-)' > %1.files \
 find ${RPM_BUILD_ROOT}%{pkg_libdir} -type d | sed 's/^/%dir /' >> %1.files \
 find ${RPM_BUILD_ROOT}%{pkg_libdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1.files \
+echo '%defattr(-,root,root,-)' > %1-prof.files \
+find ${RPM_BUILD_ROOT}%{pkg_libdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \
 sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1.files %1-prof.files \
 %{nil}
 
-%ghc_gen_scripts \
-%cabal register --gen-script \
-%cabal unregister --gen-script \
-%{nil}
+%ghc_gen_scripts %cabal register --gen-script ; %cabal unregister --gen-script
 
-%ghc_install_scripts \
-install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir} \
-%{nil}
+%ghc_install_scripts install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir}
 
-%ghc_preinst_script \
-[ "$1" = 2 ] && %{pkg_libdir}/unregister.sh >&/dev/null || : \
-%{nil}
+%ghc_register_pkg %{pkg_libdir}/register.sh >/dev/null || :
 
-%ghc_postinst_script \
-%{pkg_libdir}/register.sh >&/dev/null \
-%{nil}
+%ghc_unregister_pkg %{pkg_libdir}/unregister.sh >/dev/null || :
 
-%ghc_preun_script \
-%{pkg_libdir}/unregister.sh >&/dev/null \
-%{nil}
-
-%ghc_postun_script \
-[ "$1" = 1 ] && %{pkg_libdir}/register.sh >& /dev/null || : \
-%{nil}
-
-%ghc_reindex_haddock \
-( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || : \
-%{nil}
+%ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-9/ghc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ghc.spec	3 Nov 2008 07:11:45 -0000	1.39
+++ ghc.spec	13 Feb 2009 00:59:15 -0000	1.40
@@ -16,7 +16,7 @@
 
 Name:		ghc
 Version:	6.8.3
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -135,7 +135,7 @@
 # install rpm macros
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm
 cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
-			
+
 SRC_TOP=$PWD
 rm -f rpm-*-filelist rpm-*.files
 ( cd $RPM_BUILD_ROOT
@@ -148,7 +148,7 @@
 
 cat rpm-dir.files rpm-lib.files > rpm-base-filelist
 %if %{build_prof}
-cat rpm-dir.files rpm-prof.files > rpm-prof-filelist
+cat rpm-prof.files > rpm-prof-filelist
 %endif
 
 # these are handled as alternatives
@@ -184,17 +184,15 @@
 update-alternatives --install %{_bindir}/hsc2hs hsc2hs \
   %{_bindir}/hsc2hs-ghc 500
 
-
 %post doc
 ( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || :
 
 %preun
-if test "$1" = 0; then
+if [ "$1" = 0 ]; then
   update-alternatives --remove runhaskell %{_bindir}/runghc
   update-alternatives --remove hsc2hs     %{_bindir}/hsc2hs-ghc
 fi
 
-
 %files -f rpm-base-filelist
 %defattr(-,root,root,-)
 %doc ANNOUNCE HACKING LICENSE README
@@ -204,7 +202,6 @@
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
 %ghost %{_libdir}/ghc-%{version}/package.conf.old
 
-
 %if %{build_prof}
 %files prof -f rpm-prof-filelist
 %defattr(-,root,root,-)
@@ -213,7 +210,6 @@
 %defattr(-,root,root,-)
 %endif
 
-
 %if %{build_doc}
 %files doc -f rpm-doc-dir.files
 %defattr(-,root,root,-)
@@ -232,6 +228,17 @@
 
 
 %changelog
+* Fri Feb 13 2009 Jens Petersen <petersen at redhat.com> - 6.8.3-11
+- backport latest macros.ghc:
+
+* Mon Dec  1 2008 Jens Petersen <petersen at redhat.com>
+- update macros.ghc to latest proposed revised packaging guidelines:
+  - use runghc
+  - drop trivial cabal_build and cabal_haddock macros
+  - ghc_register_pkg and ghc_unregister_pkg replace ghc_preinst_script,
+    ghc_postinst_script, ghc_preun_script, and ghc_postun_script
+- ghc-prof does not need to own libraries dirs owned by main package
+
 * Thu Oct 23 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-10.fc9
 - remove redundant --haddockdir (interfacedir in Cabal-1.2) from cabal_configure
 - add a ghc682-prof dummy package to stop ghc-prof and ghc682-prof obsoleting