[haskell-platform] drop ghc_reindex_haddock to fix uninstall error
Jens Petersen
petersen at fedoraproject.org
Mon Mar 28 07:57:45 UTC 2011
commit d073798c42fa55a88b06f65a2d5616ccdf8f8c5a
Author: Jens Petersen <petersen at redhat.com>
Date: Mon Mar 28 16:57:38 2011 +0900
drop ghc_reindex_haddock to fix uninstall error
.chain-deps | 2 +-
haskell-platform.spec | 18 ++++++++----------
2 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/.chain-deps b/.chain-deps
index 465d774..593df28 100644
--- a/.chain-deps
+++ b/.chain-deps
@@ -2,4 +2,4 @@
echo "Prerequisites: transformers mtl"
-CHAIN_PKGS="alex ghc-deepseq ghc-fgl ghc-html ghc-HUnit ghc-OpenGL ghc-QuickCheck ghc-regex-base ghc-stm ghc-syb ghc-xhtml happy : ghc-GLUT ghc-haskell-src ghc-parallel ghc-parsec ghc-regex-posix ghc-text : ghc-network ghc-regex-compat : ghc-cgi ghc-HTTP ghc-zlib : cabal-install"
+CHAIN_PKGS="alex ghc-deepseq ghc-fgl ghc-html ghc-HUnit ghc-OpenGL ghc-QuickCheck ghc-regex-base ghc-stm ghc-syb ghc-xhtml happy : ghc-GLUT ghc-haskell-src ghc-parallel ghc-parsec ghc-regex-posix ghc-text : ghc-network ghc-regex-compat : ghc-cgi ghc-HTTP ghc-zlib : cabal-install :"
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 6fdf71d..0459bc6 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -43,7 +43,7 @@ distilled from Hackage.
Name: %{pkg_name}
Version: %{upstream_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
@@ -119,18 +119,11 @@ rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/LICENSE
%post -n ghc-%{name}-devel
-ghc-pkg recache
-%ghc_reindex_haddock
-
-
-%preun -n ghc-%{name}-devel
-ghc-pkg recache
+%ghc_pkg_recache
%postun -n ghc-%{name}-devel
-if [ "$1" -eq 0 ] ; then
- %ghc_reindex_haddock
-fi
+%ghc_pkg_recache
%files
@@ -152,6 +145,11 @@ fi
%changelog
+* Mon Mar 28 2011 Jens Petersen <petersen at redhat.com> - 2011.2.0.0-2
+- fix the install scripts:
+- ghc_reindex_haddock is now redundant
+- use ghc_pkg_recache
+
* Fri Mar 11 2011 Jens Petersen <petersen at redhat.com> - 2011.2.0.0-1
- 2011.2.0.0 final
More information about the scm-commits
mailing list