rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.7, 1.8 ghc-rpm-macros.spec, 1.9, 1.10

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
make ghc_pkg_ver only return pkg version


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ghc-rpm-macros.ghc	16 Nov 2009 09:56:31 -0000	1.7
+++ ghc-rpm-macros.ghc	16 Nov 2009 12:27:56 -0000	1.8
@@ -37,4 +37,4 @@ echo '%{ghcdocdir}' >> %1-doc.files \
 
 %ghc_version %(ghc --numeric-version)
 
-%ghc_pkg_ver() ghc-%1-%2 = %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")
+%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/devel/ghc-rpm-macros.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ghc-rpm-macros.spec	16 Nov 2009 09:56:31 -0000	1.9
+++ ghc-rpm-macros.spec	16 Nov 2009 12:27:56 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.2.4
+Version:	0.2.5
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,9 @@ 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