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

[glen]

Author: glen                         Date: Thu Feb 24 10:56:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.608 add %ghcdir

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

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.289 packages/rpm-build-macros/rpm-build-macros.spec:1.290
--- packages/rpm-build-macros/rpm-build-macros.spec:1.289	Thu Feb 24 11:44:03 2011
+++ packages/rpm-build-macros/rpm-build-macros.spec	Thu Feb 24 11:56:36 2011
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.607
+%define		rpm_macros_rev	1.608
 %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.290  2011/02/24 10:56:36  glen
+- 1.608 add %ghcdir
+
 Revision 1.289  2011/02/24 10:44:03  glen
 - 1.607: add %ghc_pkg_recache for haskell packages
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.607 packages/rpm-build-macros/rpm.macros:1.608
--- packages/rpm-build-macros/rpm.macros:1.607	Thu Feb 24 11:44:03 2011
+++ packages/rpm-build-macros/rpm.macros	Thu Feb 24 11:56:36 2011
@@ -2011,6 +2011,10 @@
 		[ -f /etc/rc.d/init.d/%1 -o -f /etc/init/%1.conf ] && { echo -n "Re-"; /sbin/service %1 start; }; \
 	fi
 
+# Haskell Macros
+# BuildRequires:  rpmbuild(macros) >= 1.608
+%ghcdir		ghc-%(/usr/bin/ghc --numeric-version 2>/dev/null || echo ERROR)
+
 # update /usr/lib*/ghc-*/package.conf.d/package.cache
 # Requires: ghc
 # BuildRequires:  rpmbuild(macros) >= 1.607
@@ -2020,6 +2024,5 @@
 	/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.289&r2=1.290&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.607&r2=1.608&f=u