https://bugzilla.redhat.com/show_bug.cgi?id=1314865 --- Comment #8 from Jan Pokorný <jpokorny@xxxxxxxxxx> --- re [comment 7]: > FIX: Packaging COPYING by "%license %{_pkgdocdir}/COPYING" does not > work. It still marks COPYING as a documentation and removes the license > file if documentation is excluded. Try package it by relative path done > or report a bug against rpm. this as well: [bug 1333509] > Please correct the `FIX' issues and provide a new spec file. https://people.redhat.com/jpokorny/pkgs/booth/review/booth.spec https://people.redhat.com/jpokorny/pkgs/booth/review/booth-1.0-2.eb4256a.git.src.rpm > @@ -98,7 +98,7 @@ > BuildRequires: hostname psmisc > BuildRequires: python2-devel > # spec file specifics > -## for _unitdir macro > +## for _unitdir, systemd_requires and specific scriptlet macros > BuildRequires: systemd > ## for autosetup > BuildRequires: git > @@ -136,6 +136,7 @@ > Group: System Environment/Daemons > BuildArch: noarch > Requires: %{name}-core = %{version}-%{release} > +%{?systemd_requires} > # deal with pre-split arrangement > Conflicts: %{name} < 1.0-1 > > @@ -143,6 +144,15 @@ > Support for running Booth, ticket manager for multi-site clusters, > as an arbitrator. > > +%post arbitrator > +%systemd_post booth@.service booth-arbitrator.service > + > +%preun arbitrator > +%systemd_preun booth@.service booth-arbitrator.service > + > +%postun arbitrator > +%systemd_postun_with_restart booth@.service booth-arbitrator.service > + > %package site > Summary: Booth support for running as a full-fledged site > Group: System Environment/Daemons > @@ -201,9 +211,10 @@ > ln -s boothd.8 %{buildroot}/%{_mandir}/man8/booth.8 > cp -a -t %{buildroot}/%{_pkgdocdir} \ > -- ChangeLog README-testing conf/booth.conf.example > -# drop what we don't package anyway > +# drop what we don't package anyway (COPYING added via tarball-relative path) > rm -rf %{buildroot}/%{_initrddir}/booth-arbitrator > rm -rf %{buildroot}/%{_pkgdocdir}/README.upgrade-from-v0.1 > +rm -rf %{buildroot}/%{_pkgdocdir}/COPYING > # tests > mkdir -p %{buildroot}/%{test_path} > cp -a -t %{buildroot}/%{test_path} \ > @@ -219,7 +230,7 @@ > VERBOSE=1 make check > > %files core > -%license %{_pkgdocdir}/COPYING > +%license COPYING > %doc %{_pkgdocdir}/AUTHORS > %doc %{_pkgdocdir}/ChangeLog > %doc %{_pkgdocdir}/README > @@ -259,5 +270,14 @@ > /usr/lib/ocf/resource.d/booth/sharedrsc > > %changelog > +* Thu May 05 2016 Jan Pokorný <jpokorny+rpm-booth@xxxxxxxxxxxxxxxxx> - 1.0-2.eb4256a.git > +- pre-inclusion cleanups in the spec (apply systemd scriptlet operations > + with booth-arbitrator, avoid overloading file implicitly considered %%doc > + as %%license) > +- update a subset of out-of-tree patches per > + https://github.com/ClusterLabs/booth/pull/22#issuecomment-216936987 > + Resolves: rhbz#1314865 > + Related: rhbz#1333509 > + > * Thu Apr 28 2016 Jan Pokorný <jpokorny+rpm-booth@xxxxxxxxxxxxxxxxx> - 1.0-1.eb4256a.git > - initial build -- 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 _______________________________________________ package-review mailing list package-review@xxxxxxxxxxxxxxxxxxxxxxx http://lists.fedoraproject.org/admin/lists/package-review@xxxxxxxxxxxxxxxxxxxxxxx