[packages/rpm-build-macros] ghc_pkg_recache: ghc-pkg may be missing if ghc itself is uninstalled

glen glen at pld-linux.org
Wed May 29 16:46:25 CEST 2013


commit 402e94f54c1b7a817282d74bc0869a3f6c3158ab
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 29 17:45:33 2013 +0300

    ghc_pkg_recache: ghc-pkg may be missing if ghc itself is uninstalled

 rpm-build-macros.spec | 2 +-
 rpm.macros            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index dcea633..e0cd320 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -4,7 +4,7 @@ Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/Building
 Source0:	rpm.macros
diff --git a/rpm.macros b/rpm.macros
index 6ee8d6b..d0fe128 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -2179,7 +2179,7 @@ fi; \
 #
 %ghc_pkg_recache() {{ \
 	umask 022; \
-	/usr/bin/ghc-pkg recache; \
+	[ ! -x /usr/bin/ghc-pkg ] || /usr/bin/ghc-pkg recache; \
 };} \
 %{nil}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/402e94f54c1b7a817282d74bc0869a3f6c3158ab



More information about the pld-cvs-commit mailing list