[ghc-rpm-macros/f14] fix devel subpackage's prof and doc obsoletes and provides versions
Jens Petersen
petersen at fedoraproject.org
Fri Sep 30 05:25:31 UTC 2011
commit 0ae61014f200d0ff1b7faceb80bbbeb6228ce602
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Sep 30 14:25:19 2011 +0900
fix devel subpackage's prof and doc obsoletes and provides versions
ghc-rpm-macros.ghc | 8 ++++----
ghc-rpm-macros.spec | 6 +++++-
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index df61aca..9427fee 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -149,10 +149,10 @@ Group: Development/Libraries\
%{-c:Requires: %{-c*}}\
%{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\
%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-doc/g")}\
-Obsoletes: %{basepkg}-doc < %{version}-%{release}\
-Provides: %{basepkg}-doc = %{version}-%{release}\
-Obsoletes: %{basepkg}-prof < %{version}-%{release}\
-Provides: %{basepkg}-prof = %{version}-%{release}\
+Obsoletes: %{basepkg}-doc < %{pkgver}-%{release}\
+Provides: %{basepkg}-doc = %{pkgver}-%{release}\
+Obsoletes: %{basepkg}-prof < %{pkgver}-%{release}\
+Provides: %{basepkg}-prof = %{pkgver}-%{release}\
\
%description -n %{basepkg}-devel\
%{?common_description}%{!?common_description:Haskell %{pkgname} library.}\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index e7e4216..6d5b4f4 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -3,7 +3,7 @@
%global macros_file %{_sysconfdir}/rpm/macros.ghc
Name: ghc-rpm-macros
-Version: 0.10.59
+Version: 0.10.60
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@@ -60,6 +60,10 @@ EOF
%changelog
+* Fri Sep 30 2011 Jens Petersen <petersen at redhat.com> - 0.10.60-1
+- fix devel subpackage's prof and doc obsoletes and provides versions
+ for multiple lib packages like ghc (reported by Henrik Nordström)
+
* Tue Sep 13 2011 Jens Petersen <petersen at redhat.com> - 0.10.59-1
- do not setup ghc-deps.sh when ghc_bootstrapping
- add ghc_test build config
More information about the scm-commits
mailing list