diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 6103094..08a179e 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -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() \ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index de51304..dad98a7 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -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 - 0.2-1 +- drop version from ghcdocdir since it breaks haddock indexing + * Wed May 13 2009 Yaakov M. Nemoy - 0.1-7 - specifies the macros file as a %%conf