Attachment 784305 Details for Bug 994021 – Docdir fixes

[patch] Docdir fixes

parrot.patch (text/plain), 2.83 KB, created by Ville Skyttä on 2013-08-08 10:32:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2013-08-08 10:32:00 UTC

Size: 2.83 KB

patch

obsolete

>diff --git a/parrot.spec b/parrot.spec
>index 6378c78..1171716 100644
>--- a/parrot.spec
>+++ b/parrot.spec
>@@ -1,4 +1,5 @@
> %global __provides_exclude perl\$DB\$|perl\$A\$|perl\$B\$
>+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
> 
> Name:           parrot
> Version:        5.2.0
>@@ -170,12 +171,16 @@ do
>     pod2man --section=1 --name=$MAN_NAME $MAN_SOURCE | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/${MAN_NAME}.1.gz
> done
> 
>-# Drop the docs so rpm can pick them up itself.
>-rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
>+# Prepare doc dir.
>+[ "%{_pkgdocdir}" = "%{_docdir}/%{name}" ] || \
>+    mv $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_pkgdocdir}
>+mv $RPM_BUILD_ROOT%{_pkgdocdir}/%{version}/* $RPM_BUILD_ROOT%{_pkgdocdir}
>+rmdir $RPM_BUILD_ROOT%{_pkgdocdir}/%{version}
>+cp -pR ChangeLog examples $RPM_BUILD_ROOT%{_pkgdocdir}
> 
> # Force permissions on doc directories.
>-find docs examples -type d -exec chmod 755 {} \;
>-find docs examples -type f -exec chmod 644 {} \;
>+find $RPM_BUILD_ROOT%{_pkgdocdir} examples -type d -exec chmod 755 {} \;
>+find $RPM_BUILD_ROOT%{_pkgdocdir} examples -type f -exec chmod 644 {} \;
> 
> 
> %define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/
>@@ -229,8 +234,8 @@ find examples -wholename 'examples/languages/abc/t/harness' \
> 
> #install desktop file
> %{__mkdir} ${RPM_BUILD_ROOT}%{_datadir}/applications/
>-%{__tar} xzf %{SOURCE1} parrot_html.desk.in --to-stdout | %{__sed} "s|@DOCDIR@|%{_docdir}/%{name}-docs-%{version}|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_html.desktop
>-%{__tar} xzf %{SOURCE1} parrot_pdf.desk.in --to-stdout | %{__sed} "s|@DOCDIR@|%{_docdir}/%{name}-docs-%{version}|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_pdf.desktop
>+%{__tar} xzf %{SOURCE1} parrot_html.desk.in --to-stdout | %{__sed} "s|@DOCDIR@|%{_pkgdocdir}|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_html.desktop
>+%{__tar} xzf %{SOURCE1} parrot_pdf.desk.in --to-stdout | %{__sed} "s|@DOCDIR@|%{_pkgdocdir}|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_pdf.desktop
> 
> desktop-file-install --delete-original --add-category="Documentation"  \
>     --dir=${RPM_BUILD_ROOT}%{_datadir}/applications                    \
>@@ -257,8 +262,10 @@ rm -rf $RPM_BUILD_ROOT
> 
> %files
> %defattr(-,root,root,-)
>-%doc ChangeLog CREDITS PBC_COMPAT PLATFORMS README.pod
>-%doc RESPONSIBLE_PARTIES TODO LICENSE
>+%dir %{_pkgdocdir}
>+%doc %{_pkgdocdir}/*
>+%exclude %{_pkgdocdir}/docs
>+%exclude %{_pkgdocdir}/examples
> %{_bindir}/parrot
> %{_libdir}/parrot/
> %exclude %{_libdir}/parrot/%{version}/tools
>@@ -268,7 +275,10 @@ rm -rf $RPM_BUILD_ROOT
> 
> %files docs
> %defattr(-,root,root,-)
>-%doc docs examples LICENSE
>+%dir %{_pkgdocdir}
>+%doc %{_pkgdocdir}/docs
>+%doc %{_pkgdocdir}/examples
>+%doc %{_pkgdocdir}/LICENSE
> %{_datadir}/applications/parrot_html.desktop
> %{_datadir}/applications/parrot_pdf.desktop
>

Actions: View | Diff

Attachments on bug 994021: 784305