fix devel subpackage's prof and doc obsoletes and provides versions

This commit is contained in:
Jens Petersen 2011-09-30 14:25:19 +09:00
parent 1347477ddf
commit 0ae61014f2
2 changed files with 9 additions and 5 deletions

View File

@ -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.}\

View File

@ -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@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@redhat.com> - 0.10.59-1
- do not setup ghc-deps.sh when ghc_bootstrapping
- add ghc_test build config