rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

provides ghc-*-doc still needed for current lib templates

Browse Source
This commit is contained in:
Jens Petersen 2011-04-01 16:54:19 +09:00
parent 78a6eab552
commit cbf3d70e56
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghc-rpm-macros.ghc
View File

@ -162,6 +162,7 @@ Group: Development/Libraries\
%{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\ %{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\
%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-doc/g")}\ %{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-doc/g")}\
Obsoletes: %{basepkg}-doc < %{version}-%{release}\ Obsoletes: %{basepkg}-doc < %{version}-%{release}\
Provides: %{basepkg}-doc = %{version}-%{release}\
\ \
%description -n %{basepkg}-devel\ %description -n %{basepkg}-devel\
%{?common_description}%{!?common_description:Haskell %{pkgname} library.}\ %{?common_description}%{!?common_description:Haskell %{pkgname} library.}\

7
ghc-rpm-macros.spec
View File

@ -1,7 +1,7 @@
%global debug_package %{nil} %global debug_package %{nil}
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 0.11.13 Version: 0.11.14
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -58,10 +58,13 @@ EOF
%changelog %changelog
* Fri Apr 1 2011 Jens Petersen <petersen@redhat.com> - 0.11.14-1
- provides ghc-*-doc still needed for current lib templates
* Mon Mar 28 2011 Jens Petersen <petersen@redhat.com> - 0.11.13-1 * Mon Mar 28 2011 Jens Petersen <petersen@redhat.com> - 0.11.13-1
- ghc-deps.sh: check PKGBASEDIR exists to avoid warning for bin package - ghc-deps.sh: check PKGBASEDIR exists to avoid warning for bin package
- abort cabal_configure if ghc is not self-bootstrapped - abort cabal_configure if ghc is not self-bootstrapped
- make ghc_reindex_haddock a safe : no-op - make ghc_reindex_haddock a safe no-op
- no longer provide ghc-*-doc - no longer provide ghc-*-doc
- no longer run ghc_reindex_haddock in ghc-*-devel scripts - no longer run ghc_reindex_haddock in ghc-*-devel scripts