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

[Jens Petersen]

Author: petersen

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

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-12/ghc-rpm-macros.ghc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ghc-rpm-macros.ghc	22 Sep 2009 10:08:17 -0000	1.4
+++ ghc-rpm-macros.ghc	8 Dec 2009 00:49:48 -0000	1.5
@@ -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-12/ghc-rpm-macros.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ghc-rpm-macros.spec	22 Sep 2009 10:08:17 -0000	1.6
+++ ghc-rpm-macros.spec	8 Dec 2009 00:49:48 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		ghc-rpm-macros
-Version:	0.2.1
-Release:	2%{?dist}
+Version:	0.2.5
+Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
 Group:		Development/Libraries
@@ -48,6 +48,18 @@ 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!