[ghc-rpm-macros] revert the ghc doc index changes back to just using a (now optional) cronjob

Jens Petersen petersen at fedoraproject.org
Fri Nov 16 07:25:05 UTC 2012


commit 93b9c369fcb35e2ee92f9bc4e79b7599609e8160
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Nov 16 16:25:00 2012 +0900

    revert the ghc doc index changes back to just using a (now optional) cronjob
    
    The overhead to re-indexing in posttrans and postun seems too high

 ghc-rpm-macros.ghc |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index f9edaa1..404bb07 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -218,27 +218,9 @@ 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\
-if [ $1 -gt 1 ] ; then\
-  if [ -d %{_localstatedir}/lib/rpm-state/ghc/ ]; then\
-    touch %{_localstatedir}/lib/rpm-state/ghc/haddock-reindex\
-  fi\
-else\
-  cd %{ghcdocbasedir}/libraries\
-  ./gen_contents_index >/dev/null\
-fi\
-\
-%posttrans -n %{basepkg}-devel\
-if [ -f %{_localstatedir}/lib/rpm-state/ghc/haddock-reindex ]; then\
-  cd %{ghcdocbasedir}/libraries\
-  ./gen_contents_index >/dev/null\
-  rm %{_localstatedir}/lib/rpm-state/ghc/haddock-reindex\
-fi
+%ghc_pkg_recache
 
 # ghc_package_devel [-c cdepslist] [-h pkgdepslist] [-l licensetag] [name] [version]
 %ghc_package_devel(c:h:l:)\


More information about the scm-commits mailing list