From 87815fa4c08921311c51e9d0a169df38e59c347a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 22 Sep 2009 10:08:17 +0000 Subject: [PATCH] revert last change - unversion ghcdocdir --- ghc-rpm-macros.ghc | 2 +- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 b5887b9..25191aa 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,6 +1,6 @@ Name: ghc-rpm-macros Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?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-2 +- no, revert versioned ghcdocdir again! + * Tue Sep 22 2009 Jens Petersen - 0.2.1-1 - version ghcdocdir to allow multiple doc versions like ghcpkgdir