[packages/midori] fix doc packaging
glen
glen at pld-linux.org
Thu Feb 7 21:23:47 CET 2013
commit 90993f2009488e859f529dcc9626c526164dfdf2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Feb 7 22:23:40 2013 +0200
fix doc packaging
midori.spec | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/midori.spec b/midori.spec
index f8c0d01..87875ea 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,5 +1,3 @@
-# TODO:
-# - docdir fix (both docdir/midori and docdir/midori-version exist too)
Summary: Web browser based on GTK+ WebCore
Summary(hu.UTF-8): GTK+ WebCore alapú web-böngésző
Summary(pl.UTF-8): Przeglądarka WWW oparta na GTK+ WebCore
@@ -91,7 +89,6 @@ Dokumentacja API midori.
%install
rm -rf $RPM_BUILD_ROOT
-
./waf install \
--destdir=$RPM_BUILD_ROOT
@@ -100,6 +97,8 @@ install -d $RPM_BUILD_ROOT%{_gtkdocdir}/{katze,midori}
cp _build/docs/api/katze/html/* $RPM_BUILD_ROOT%{_gtkdocdir}/katze
cp _build/docs/api/midori/html/* $RPM_BUILD_ROOT%{_gtkdocdir}/midori
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+
# no -devel package, unlink
%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/%{name}-0.4
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/vala/vapi
@@ -123,15 +122,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog HACKING README TODO TRANSLATE INSTALL
%attr(755,root,root) %{_bindir}/midori
-%dir %{_libdir}/midori
-%attr(755,root,root) %{_libdir}/midori/*.so
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/*.so
/etc/xdg/midori
%{_desktopdir}/midori.desktop
%{_desktopdir}/midori-private.desktop
%{_iconsdir}/hicolor/*/*/*.png
%{_iconsdir}/hicolor/*/*/*.svg
-%{_datadir}/midori
-%{_docdir}/midori
+%{_datadir}/%{name}
%files apidocs
%defattr(644,root,root,755)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/midori.git/commitdiff/90993f2009488e859f529dcc9626c526164dfdf2
More information about the pld-cvs-commit
mailing list