packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[glen]

Author: glen                         Date: Thu Feb 24 10:44:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.607: add %ghc_pkg_recache for haskell packages

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.288 -> 1.289) , rpm.macros (1.606 -> 1.607) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.288 packages/rpm-build-macros/rpm-build-macros.spec:1.289
--- packages/rpm-build-macros/rpm-build-macros.spec:1.288	Wed Feb 23 11:46:36 2011
+++ packages/rpm-build-macros/rpm-build-macros.spec	Thu Feb 24 11:44:03 2011
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.606
+%define		rpm_macros_rev	1.607
 %define		find_lang_rev	1.34
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.289  2011/02/24 10:44:03  glen
+- 1.607: add %ghc_pkg_recache for haskell packages
+
 Revision 1.288  2011/02/23 10:46:36  glen
 - py_lint: fix files counting
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.606 packages/rpm-build-macros/rpm.macros:1.607
--- packages/rpm-build-macros/rpm.macros:1.606	Wed Feb 23 11:45:55 2011
+++ packages/rpm-build-macros/rpm.macros	Thu Feb 24 11:44:03 2011
@@ -986,6 +986,7 @@
 
 %py3_ocomp		%{__python3} -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
 
+
 # Hardlink binary identical .pyc and .pyo files
 %__spec_install_post_py_hardlink {\
 %{!?no_install_post_py_hardlink: __spec_install_post_py_hardlink() { \
@@ -2009,5 +2010,16 @@
 		/sbin/initctl stop %1 >/dev/null 2>&1 \
 		[ -f /etc/rc.d/init.d/%1 -o -f /etc/init/%1.conf ] && { echo -n "Re-"; /sbin/service %1 start; }; \
 	fi
+
+# update /usr/lib*/ghc-*/package.conf.d/package.cache
+# Requires: ghc
+# BuildRequires:  rpmbuild(macros) >= 1.607
+#
+%ghc_pkg_recache () {{ \
+	umask 022; \
+	/usr/bin/ghc-pkg recache; \
+};} \
+%{nil}
+
 
 # EOF
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.288&r2=1.289&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.606&r2=1.607&f=u