fix doc handling of subpackages for ghc_without_shared
This commit is contained in:
parent
8fc16e2daa
commit
bbc5f8f364
@ -49,11 +49,11 @@ echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >>
|
|||||||
fi\
|
fi\
|
||||||
%endif\
|
%endif\
|
||||||
%if %{defined ghc_without_shared}\
|
%if %{defined ghc_without_shared}\
|
||||||
if [ "%{name}" = "ghc-%{pkg_name}" ]; then\
|
if [ "%{name}" = "%{basepkg}" -o -n "%{?1}" ]; then\
|
||||||
if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
|
if [ -d "%{buildroot}%{_docdir}/%{basepkg}-%{pkgver}" ]; then\
|
||||||
mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-devel-%{version}\
|
mv %{buildroot}%{_docdir}/%{basepkg}-%{pkgver} %{buildroot}%{_docdir}/%{basepkg}-devel-%{pkgver}\
|
||||||
%if %{undefined ghc_exclude_docdir}\
|
%if %{undefined ghc_exclude_docdir}\
|
||||||
echo "%{_docdir}/%{name}-devel-%{version}" >> %{basepkg}-devel.files\
|
echo "%{_docdir}/%{basepkg}-devel-%{version}" >> %{basepkg}-devel.files\
|
||||||
%endif\
|
%endif\
|
||||||
fi\
|
fi\
|
||||||
fi\
|
fi\
|
||||||
|
@ -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.92
|
Version: 0.93
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Macros for building packages for GHC
|
Summary: Macros for building packages for GHC
|
||||||
|
|
||||||
@ -60,6 +60,9 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 7 2012 Jens Petersen <petersen@redhat.com> - 0.93-1
|
||||||
|
- fix doc handling of subpackages for ghc_without_shared
|
||||||
|
|
||||||
* Thu Jun 7 2012 Jens Petersen <petersen@redhat.com> - 0.92-1
|
* Thu Jun 7 2012 Jens Petersen <petersen@redhat.com> - 0.92-1
|
||||||
- move --disable-library-for-ghci to ghc_lib_build
|
- move --disable-library-for-ghci to ghc_lib_build
|
||||||
- revert back to fallback behaviour for common_summary and common_description
|
- revert back to fallback behaviour for common_summary and common_description
|
||||||
|
Loading…
Reference in New Issue
Block a user