simplify adding shared subpackage license file; own ghc-deps.sh not /usr/lib/rpm
This commit is contained in:
parent
a1abcaaa78
commit
876ea626db
@ -33,11 +33,11 @@ echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >>
|
|||||||
fi\
|
fi\
|
||||||
%endif\
|
%endif\
|
||||||
echo "%defattr(-,root,root,-)" > %{basepkg}-devel.files\
|
echo "%defattr(-,root,root,-)" > %{basepkg}-devel.files\
|
||||||
for dir in %{_docdir}/{ghc-,}%{pkgnamever}; do\
|
%if 0%{!?1:1}\
|
||||||
if [ -d "%{buildroot}${dir}" ]; then\
|
if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
|
||||||
echo "${dir}" >> %{basepkg}%{?without_shared:-devel}.files\
|
echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?without_shared:-devel}.files\
|
||||||
fi\
|
fi\
|
||||||
done\
|
%endif\
|
||||||
echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\
|
echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\
|
||||||
if [ -d "%{buildroot}%{pkgdir}" ]; then\
|
if [ -d "%{buildroot}%{pkgdir}" ]; then\
|
||||||
find %{buildroot}%{pkgdir} -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\
|
find %{buildroot}%{pkgdir} -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 0.11.5
|
Version: 0.11.6
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Macros for building packages for GHC
|
Summary: Macros for building packages for GHC
|
||||||
|
|
||||||
@ -43,10 +43,14 @@ install -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
|
|||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc COPYING AUTHORS
|
%doc COPYING AUTHORS
|
||||||
%config(noreplace) %{_sysconfdir}/rpm/macros.ghc
|
%config(noreplace) %{_sysconfdir}/rpm/macros.ghc
|
||||||
%{_prefix}/lib/rpm
|
%{_prefix}/lib/rpm/ghc-deps.sh
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 29 2011 Jens Petersen <petersen@redhat.com> - 0.11.6-1
|
||||||
|
- simplify adding shared subpackage license file
|
||||||
|
- own ghc-deps.sh not /usr/lib/rpm
|
||||||
|
|
||||||
* Sun Jan 23 2011 Jens Petersen <petersen@redhat.com> - 0.11.5-1
|
* Sun Jan 23 2011 Jens Petersen <petersen@redhat.com> - 0.11.5-1
|
||||||
- add rpm hash requires for dynamic executables in ghc-deps.sh
|
- add rpm hash requires for dynamic executables in ghc-deps.sh
|
||||||
- compile Setup in cabal macro
|
- compile Setup in cabal macro
|
||||||
|
Loading…
Reference in New Issue
Block a user