https://bugzilla.redhat.com/show_bug.cgi?id=1754964
--- Comment #9 from Miro Hrončok <mhroncok(a)redhat.com> ---
--- breezy.spec.orig 2019-09-27 10:28:16.923615896 +0200
+++ breezy.spec 2019-09-27 10:48:05.020867674 +0200
@@ -9,8 +9,6 @@
#global brzrc b6
%global baserelease 1
-%global _pkgdocdir %{_docdir}/%{name}-%{version}
-
Name: breezy
Version: %{brzmajor}%{?brzminor}
Release: %{baserelease}%{?brzrc:.}%{?brzrc}%{?dist}
@@ -47,6 +45,9 @@
# This is needed for launchpad support
Recommends: python3-launchpadlib
+# Docs are not needed, but some might want them
+Suggests: %{name}-doc = %{version}-%{release}
+
%description
Breezy (brz) is a decentralized revision control system, designed to be easy
for developers and end users alike.
@@ -57,7 +58,6 @@
%package doc
Summary: Documentation for Breezy
BuildArch: noarch
-Suggests: %{name} = %{version}-%{release}
%description doc
This package contains the documentation for the Breezy version control system.
@@ -85,6 +85,13 @@
# Build documents
make docs-sphinx PYTHON=%{__python3}
+rm doc/*/_build/html/.buildinfo
+rm -f doc/*/_build/html/_static/*/Makefile
+pushd doc
+for dir in *; do
+ test -d $dir/_build/html && mv $dir/_build/html ../$dir
+done
+popd
%install
@@ -99,24 +106,6 @@
install -Dpm 0644 contrib/bash/brz %{buildroot}$bashcompdir/brz
rm contrib/bash/brz
-# Install documents
-install -d %{buildroot}/%{_pkgdocdir}/pdf
-cp -pr NEWS README.rst TODO COPYING.txt contrib/ %{buildroot}/%{_pkgdocdir}/
-cd doc
-for dir in *; do
- if [ -d $dir/_build/html ]; then
- cp -R $dir/_build/html %{buildroot}%{_pkgdocdir}/$dir
- rm -f %{buildroot}%{_pkgdocdir}/$dir/.buildinfo
- rm -f %{buildroot}%{_pkgdocdir}/$dir/_static/$dir/Makefile
- pushd %{buildroot}
- find .%{_pkgdocdir}/$dir -name '*.pdf' | while read pdf; do
- ln -s $pdf %{buildroot}%{_pkgdocdir}/pdf/
- done
- popd
- fi
-done
-cd ..
-
install -d %{buildroot}%{_datadir}/pixmaps
install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/brz.png
@@ -124,8 +113,8 @@
mv %{buildroot}%{_prefix}/man %{buildroot}%{_datadir}
# backwards compatible symbolic links
-ln -s brz.1 %{buildroot}%{_mandir}/man1/bzr.1
ln -s brz %{buildroot}%{_bindir}/bzr
+echo ".so man1/brz.1" > %{buildroot}%{_mandir}/man1/bzr.1
# locales: all the .po files have empty msgstrs, so this doesn't do anything
#mv %%{name}/locale %%{buildroot}%%{_datadir}
@@ -134,12 +123,8 @@
%files
# ... -f %%{name}.lang
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/NEWS
-%doc %{_pkgdocdir}/README.rst
-%doc %{_pkgdocdir}/TODO
-%doc %{_pkgdocdir}/COPYING.txt
-%doc %{_pkgdocdir}/contrib/
+%license COPYING.txt
+%doc NEWS README.rst TODO contrib/
%{_bindir}/brz
%{_bindir}/bzr
%{_bindir}/bzr-*-pack
@@ -152,13 +137,8 @@
%files doc
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/*
-%exclude %{_pkgdocdir}/NEWS
-%exclude %{_pkgdocdir}/README.rst
-%exclude %{_pkgdocdir}/TODO
-%exclude %{_pkgdocdir}/COPYING.txt
-%exclude %{_pkgdocdir}/contrib/
+%license COPYING.txt
+%doc en developers
%changelog
Spec URL:
https://churchyard.fedorapeople.org/SRPMS/breezy.spec
SRPM URL:
https://churchyard.fedorapeople.org/SRPMS/breezy-3.0.1-1.fc30.src.rpm
--
You are receiving this mail because:
You are on the CC list for the bug.
You are always notified about changes to this product and component