[ghc-rpm-macros] move macros.ghc to /usr/lib/rpm to avoid conflict with redhat-rpm-config

[Jens Petersen]

commit da128f954a93e88ef3c32d9658bf502b15d1ac32
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat May 28 12:19:35 2011 +0900

    move macros.ghc to /usr/lib/rpm to avoid conflict with redhat-rpm-config

 ghc-rpm-macros.ghc  |    2 +-
 ghc-rpm-macros.spec |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index df7db99..9cb5c5b 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -140,7 +140,7 @@ This package provides the shared library.\
 %global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}\
 %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
 %package -n %{basepkg}-devel\
-Summary:        %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\
+Summary:        Development files for %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\
 Group:          Development/Libraries\
 %{?1:Version:        %{pkgver}}\
 %{-l:License:        %{-l*}}\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index d5b1132..c725c97 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:		ghc-rpm-macros
-Version:	0.13
+Version:	0.13.1
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -32,10 +32,8 @@ echo no build stage needed
 
 
 %install
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm
-install -p -m 0644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
-
 mkdir -p ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
+install -p -m 0644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/macros.ghc
 install -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
 
 # this is why this package is now arch-dependent:
@@ -58,6 +56,9 @@ EOF
 
 
 %changelog
+* Sat May 28 2011 Jens Petersen <petersen at redhat.com> - 0.13.1-1
+- move macros.ghc to /usr/lib/rpm to avoid conflict with redhat-rpm-config
+
 * Wed May 11 2011 Jens Petersen <petersen at redhat.com> - 0.13-1
 - merge prof subpackages into devel to simplify packaging