rpms/ghc-rpm-macros/F-12 ghc-rpm-macros.ghc, 1.5, 1.6 ghc-rpm-macros.spec, 1.7, 1.8

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc-rpm-macros/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11370

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
- backport new macros from rawhide:
  - add ghc_requires, ghc_doc_requires, ghc_prof_requires
  - allow ghc_version_override to override ghc_version (for ghc)




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-12/ghc-rpm-macros.ghc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ghc-rpm-macros.ghc	8 Dec 2009 00:49:48 -0000	1.5
+++ ghc-rpm-macros.ghc	25 Dec 2009 15:37:49 -0000	1.6
@@ -11,7 +11,7 @@ make -f cabal-rpm.mk %{_smp_mflags} \
 %cabal_install %cabal copy --destdir=${RPM_BUILD_ROOT} -v
 
 %ghcdocdir %{_docdir}/ghc/libraries/%{?pkg_name}%{!?pkg_name:%{name}}
-%ghcpkgdir %{_libdir}/ghc-%(ghc --numeric-version)/%{?pkg_name}%{!?pkg_name:%name}-%{version}
+%ghcpkgdir %{_libdir}/ghc-%{ghc_version}/%{?pkg_name}%{!?pkg_name:%name}-%{version}
 
 %ghc_gen_filelists() \
 rm -f %1-devel.files %1-prof.files %1-doc.files \
@@ -35,6 +35,20 @@ echo '%{ghcdocdir}' >> %1-doc.files \
 
 %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
 
-%ghc_version %(ghc --numeric-version)
+%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
 
 %ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")
+
+%ghc_requires Requires:       ghc = %{ghc_version}\
+Requires(post): ghc = %{ghc_version}\
+Requires(preun): ghc = %{ghc_version}\
+%if %{with shared}\
+Requires:       ghc-%{?pkg_name}%{!?pkg_name:%name} = %{version}-%{release}\
+%endif
+
+%ghc_doc_requires Requires:       ghc-doc = %{ghc_version}\
+Requires(post): ghc-doc = %{ghc_version}\
+Requires(postun): ghc-doc = %{ghc_version}
+
+%ghc_prof_requires Requires:       ghc-prof = %{ghc_version}\
+Requires:       ghc-%{?pkg_name}%{!?pkg_name:%name}-devel = %{version}-%{release}


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-12/ghc-rpm-macros.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ghc-rpm-macros.spec	8 Dec 2009 00:49:48 -0000	1.7
+++ ghc-rpm-macros.spec	25 Dec 2009 15:37:49 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.2.5
+Version:	0.2.6
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Jens Petersen <petersen at redhat.com> - 0.2.6-1
+- backport:
+  - add ghc_requires, ghc_doc_requires, ghc_prof_requires
+  - allow ghc_version_override to override ghc_version (for ghc)
+
 * Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.5-1
 - make ghc_pkg_ver only return pkg version