rpms/ghc-rpm-macros/F-11 ghc-rpm-macros.ghc, 1.2, 1.3 ghc-rpm-macros.spec, 1.2, 1.3

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
backport %ghc_pkg_ver for generating ghc pkg requires version deps


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-11/ghc-rpm-macros.ghc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-rpm-macros.ghc	12 Jun 2009 00:19:49 -0000	1.2
+++ ghc-rpm-macros.ghc	8 Dec 2009 01:00:13 -0000	1.3
@@ -36,3 +36,5 @@ 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_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-11/ghc-rpm-macros.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-rpm-macros.spec	12 Jun 2009 00:19:49 -0000	1.2
+++ ghc-rpm-macros.spec	8 Dec 2009 01:00:13 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.2
+Version:	0.2.5
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.5-1
+- make ghc_pkg_ver only return pkg version
+
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.4-1
+- change GHCRequires to ghc_pkg_ver
+
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.3-1
+- use the latest installed pkg version for %%GHCRequires
+
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.2-1
+- add %%GHCRequires for automatically versioned library deps
+
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1-2
+- no, revert versioned ghcdocdir again!
+
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1-1
+- version ghcdocdir to allow multiple doc versions like ghcpkgdir
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun  9 2009 Jens Petersen <petersen at redhat.com> - 0.2-1
 - drop version from ghcdocdir since it breaks haddock indexing