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

fix double listing of docdir in base lib package

Browse Source
This commit is contained in:
Jens Petersen 2011-11-12 21:59:12 +09:00
parent fb65ca3a00
commit b1204c472c
2 changed files with 5 additions and 5 deletions

5
ghc-rpm-macros.ghc
View File

@ -51,10 +51,7 @@ fi\
%if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\ %if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\
if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\ if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\ echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
fi\ elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
%endif\
%if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\
if [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\ echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
fi\ fi\
%endif\ %endif\

5
ghc-rpm-macros.spec
View File

@ -3,7 +3,7 @@
%global macros_file %{_sysconfdir}/rpm/macros.ghc %global macros_file %{_sysconfdir}/rpm/macros.ghc
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 0.14 Version: 0.14.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -59,6 +59,9 @@ EOF
%changelog %changelog
* Sat Nov 12 2011 Jens Petersen <petersen@redhat.com> - 0.14.1-1
- fix double listing of docdir in base lib package
* Tue Nov 1 2011 Jens Petersen <petersen@redhat.com> - 0.14-1 * Tue Nov 1 2011 Jens Petersen <petersen@redhat.com> - 0.14-1
- replace devel ghc requires with ghc-compiler - replace devel ghc requires with ghc-compiler
- disable testsuite in ghc_bootstrap - disable testsuite in ghc_bootstrap