- 1.608 add %ghcdir

Changed files:
    rpm-build-macros.spec -> 1.290
    rpm.macros -> 1.608

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 6d0a83f94f63b499e8c88d4bf4ee697ec1f7f4b2..1babe37a22b0117e1d32b5a10266c19cb5d9d137 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%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

diff --git a/rpm.macros b/rpm.macros
index 122559ce3ade10d96da6e3669de7a5b4768dbfc4..4709d0946178bfb4a27055bd3ef62db19ff12064 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -2011,6 +2011,10 @@ else: \
                [ -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
@@ -2021,5 +2025,4 @@ else: \
 };} \
 %{nil}
 
-
 # EOF