From 9e0aa2550c88a5b3454ce9d7e7d993a548568173 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 29 Oct 2012 20:02:06 +0900 Subject: [PATCH] bring back doc re-indexing in posttrans using /var/lib/rpm-state/ghc/ --- ghc-rpm-macros.ghc | 12 +++++++++++- ghc-rpm-macros.spec | 6 +++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 404bb07..d73ac37 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -218,9 +218,19 @@ This package contains the development files. %define basepkg ghc-%{pkgname}\ %post -n %{basepkg}-devel\ %ghc_pkg_recache\ +if [ -d %{_localstatedir}/lib/rpm-state/ghc/ ]; then\ + touch %{_localstatedir}/lib/rpm-state/ghc/haddock-reindex\ +fi\ \ %postun -n %{basepkg}-devel\ -%ghc_pkg_recache +%ghc_pkg_recache\ +\ +%posttrans -n %{basepkg}-devel\ +if [ -f %{_localstatedir}/lib/rpm-state/ghc/haddock-reindex ]; then\ + cd %{ghcdocbasedir}/libraries\ + ./gen_contents_index\ + rm %{_localstatedir}/lib/rpm-state/ghc/haddock-reindex\ +fi # ghc_package_devel [-c cdepslist] [-h pkgdepslist] [-l licensetag] [name] [version] %ghc_package_devel(c:h:l:)\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index ce39bc2..2bae0ee 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -6,7 +6,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 0.97.3 +Version: 0.98 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -72,6 +72,10 @@ EOF %changelog +* Mon Oct 29 2012 Jens Petersen - 0.98-1 +- gen_contents_index is now run once from posttrans (#870694) + http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Saving_state_between_scriptlets + * Thu Oct 25 2012 Jens Petersen - 0.97.3-1 - BR redhat-rpm-config instead of ghc-rpm-macros - no longer set without_hscolour in macros.ghc for bootstrapping