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

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
drop version from ghcdocdir since it breaks haddock indexing


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-11/ghc-rpm-macros.ghc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-rpm-macros.ghc	13 May 2009 07:48:42 -0000	1.1
+++ ghc-rpm-macros.ghc	12 Jun 2009 00:19:49 -0000	1.2
@@ -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}}-%{version}
+%ghcdocdir %{_docdir}/ghc/libraries/%{?pkg_name}%{!?pkg_name:%{name}}
 %ghcpkgdir %{_libdir}/ghc-%(ghc --numeric-version)/%{?pkg_name}%{!?pkg_name:%name}-%{version}
 
 %ghc_gen_filelists() \


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-11/ghc-rpm-macros.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-rpm-macros.spec	13 May 2009 07:48:42 -0000	1.1
+++ ghc-rpm-macros.spec	12 Jun 2009 00:19:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ghc-rpm-macros
-Version:	0.1
-Release:	7%{?dist}
+Version:	0.2
+Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
 Group:		Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun  9 2009 Jens Petersen <petersen at redhat.com> - 0.2-1
+- drop version from ghcdocdir since it breaks haddock indexing
+
 * Wed May 13 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.1-7
 - specifies the macros file as a %%conf