From 082b15a21d9f5ff4ddabb246eaeadfbc6ecf8ce6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 22 Sep 2009 03:25:59 +0000 Subject: [PATCH] version ghcdocdir to allow multiple doc versions like ghcpkgdir --- ghc-rpm-macros.ghc | 2 +- ghc-rpm-macros.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 08a179e..6103094 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}} +%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() \ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 2785d0d..b5887b9 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -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 - 0.2.1-1 +- version ghcdocdir to allow multiple doc versions like ghcpkgdir + * Fri Jul 24 2009 Fedora Release Engineering - 0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild