rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.2, 1.3 ghc-rpm-macros.spec, 1.4, 1.5

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
version ghcdocdir to allow multiple doc versions like ghcpkgdir


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-rpm-macros.ghc	9 Jun 2009 09:24:58 -0000	1.2
+++ ghc-rpm-macros.ghc	22 Sep 2009 03:25:59 -0000	1.3
@@ -10,7 +10,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}}
+%ghcdocdir %{_docdir}/ghc/libraries/%{?pkg_name}%{!?pkg_name:%{name}}-%{version}
 %ghcpkgdir %{_libdir}/ghc-%(ghc --numeric-version)/%{?pkg_name}%{!?pkg_name:%name}-%{version}
 
 %ghc_gen_filelists() \


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ghc-rpm-macros.spec	25 Jul 2009 00:05:15 -0000	1.4
+++ ghc-rpm-macros.spec	22 Sep 2009 03:25:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		ghc-rpm-macros
-Version:	0.2
-Release:	2%{?dist}
+Version:	0.2.1
+Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
 Group:		Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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