[ghc-rpm-macros] rename back to macros.ghc again; revert previous devel summary ordering change

Jens Petersen petersen at fedoraproject.org
Thu Jun 2 04:36:00 UTC 2011


commit 232d0166b5b22cdfd0728ed78d12b391bb188777
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Jun 2 13:35:47 2011 +0900

    rename back to macros.ghc again; revert previous devel summary ordering change

 ghc-rpm-macros.ghc  |    2 +-
 ghc-rpm-macros.spec |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 9cb5c5b..df7db99 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:        Development files for %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\
+Summary:        %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\
 Group:          Development/Libraries\
 %{?1:Version:        %{pkgver}}\
 %{-l:License:        %{-l*}}\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index aa19974..e1dfa84 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -1,9 +1,9 @@
 %global debug_package %{nil}
 
-%global macros_file %{_sysconfdir}/rpm/macros.ghc-pkg
+%global macros_file %{_sysconfdir}/rpm/macros.ghc
 
 Name:		ghc-rpm-macros
-Version:	0.13.2
+Version:	0.13.3
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -60,6 +60,10 @@ EOF
 
 
 %changelog
+* Thu Jun  2 2011 Jens Petersen <petersen at redhat.com> - 0.13.3-1
+- rename macros.ghc-pkg back to macros.ghc
+- move the devel summary prefix back to a suffix
+
 * Sat May 28 2011 Jens Petersen <petersen at redhat.com> - 0.13.2-1
 - macros need to live in /etc/rpm
 - use macro_file for macros.ghc filepath


More information about the scm-commits mailing list