Attachment 903154 Details for Bug 1105790 – Patch which should fix this issue.

[patch] Patch which should fix this issue.

0001-spec-python-doc-should-be-in-doc-subpackage-only.patch (text/plain), 2.88 KB, created by Pavel Raiskup on 2014-06-07 19:17:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Raiskup

Created: 2014-06-07 19:17:11 UTC

Size: 2.88 KB

patch

obsolete

>From 5a472933432c2cff3f9248c6d43e2bc5dcb33a93 Mon Sep 17 00:00:00 2001
>From: Pavel Raiskup <praiskup@redhat.com>
>Date: Sat, 7 Jun 2014 20:00:51 +0200
>Subject: [PATCH] [spec] python-doc should be in -doc subpackage only
>
>Fix for unexpected %{_pkdocdir} design fail (seems like relative
>%doc %files specifications should not be used).  See FPC ticket:
>https://fedorahosted.org/fpc/ticket/338
>---
> backend/copr-backend.spec   | 6 ++++--
> frontend/copr-frontend.spec | 8 ++++++--
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
>diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
>index de07ca6..648fd8e 100644
>--- a/backend/copr-backend.spec
>+++ b/backend/copr-backend.spec
>@@ -120,6 +120,7 @@ install -m 0644 copr-backend.service %{buildroot}/%{_unitdir}/
> #doc
> cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/
> cp -a playbooks %{buildroot}%{_pkgdocdir}/
>+install -p -m 644 LICENSE %{buildroot}%{_pkgdocdir}
> 
> %pre
> getent group copr >/dev/null || groupadd -r copr
>@@ -137,7 +138,6 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
> %systemd_postun_with_restart copr-backend.service
> 
> %files
>-%doc LICENSE
> %dir %{_datadir}/copr
> %dir %{_sharedstatedir}/copr
> %dir %attr(0755, copr, copr) %{_sharedstatedir}/copr/jobs/
>@@ -153,6 +153,7 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
> 
> %config(noreplace) %{_sysconfdir}/logrotate.d/copr-backend
> %dir %{_pkgdocdir}
>+%doc %{_pkgdocdir}/LICENSE
> %doc %{_pkgdocdir}/lighttpd
> %doc %{_pkgdocdir}/playbooks
> %dir %{_sysconfdir}/copr
>@@ -166,7 +167,8 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
> %{_datadir}/copr/copr-be.py*
> 
> %files doc
>-%doc LICENSE
>+%dir %{_pkgdocdir}
>+%doc %{_pkgdocdir}/LICENSE
> %doc %{_pkgdocdir}/python-doc
> %exclude %{_pkgdocdir}/lighttpd
> %exclude %{_pkgdocdir}/playbooks
>diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec
>index eecd1d3..9e0d00e 100644
>--- a/frontend/copr-frontend.spec
>+++ b/frontend/copr-frontend.spec
>@@ -118,6 +118,8 @@ rm %{buildroot}%{_datadir}/copr/coprs_frontend/CONTRIBUTION_GUIDELINES
> touch %{buildroot}%{_sharedstatedir}/copr/data/copr.db
> 
> cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/
>+install -p -m 644 LICENSE %{buildroot}%{_pkgdocdir}
>+install -p -m 644 coprs.conf.example %{buildroot}%{_pkgdocdir}
> 
> %check
> %if %{with_test} && %{_arch} == "x86_64"
>@@ -137,7 +139,9 @@ useradd -r -g copr-fe -G copr-fe -d %{_datadir}/copr/coprs_frontend -s /bin/bash
> service httpd condrestart
> 
> %files
>-%doc LICENSE coprs.conf.example
>+%dir %{_pkgdocdir}
>+%doc %{_pkgdocdir}/LICENSE
>+%doc %{_pkgdocdir}/coprs.conf.example
> %dir %{_datadir}/copr
> %dir %{_sysconfdir}/copr
> %dir %{_sharedstatedir}/copr
>@@ -157,8 +161,8 @@ service httpd condrestart
> %config(noreplace)  %{_sysconfdir}/copr/copr_unit_test.conf
> 
> %files doc
>-%doc LICENSE
> %dir %{_pkgdocdir}
>+%doc %{_pkgdocdir}/LICENSE
> %doc %{_pkgdocdir}/python-doc
> 
> %changelog
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1105790: 903154