From 4404d03dd2a1e29e863aa1dc27af7d04b42cc9cf Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Jul 02 2018 18:54:35 +0000 Subject: Ticket 49811 - lib389 setup.py should install autogenerated man pages Description: Create and install the lib389 cli man pages in its setup.py file. Previously running "make" in a dev environment was failing because "make' was not installing lib389 (and its man pages) which was breaking the build. https://pagure.io/389-ds-base/issue/49811 Reviewed by: ? --- diff --git a/Makefile.am b/Makefile.am index fdb13f3..2ba98bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -974,10 +974,6 @@ dist_man_MANS = man/man1/dbscan.1 \ man/man8/db2ldif.pl.8 \ man/man8/db2index.8 \ man/man8/db2index.pl.8 \ - man/man8/dsconf.8 \ - man/man8/dsctl.8 \ - man/man8/dsidm.8 \ - man/man8/dscreate.8 \ man/man8/fixup-linkedattrs.pl.8 \ man/man8/fixup-memberof.pl.8 \ man/man8/ldif2db.8 \ diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in index 9a5d0e3..53e36b0 100644 --- a/rpm/389-ds-base.spec.in +++ b/rpm/389-ds-base.spec.in @@ -393,10 +393,10 @@ pushd ./src/lib389 popd # argparse-manpage dynamic man pages have hardcoded man v1 in header, # need to change it to v8 -sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/man/man8/dsconf.8 -sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/man/man8/dsctl.8 -sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/man/man8/dsidm.8 -sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/man/man8/dscreate.8 +sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsconf.8 +sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsctl.8 +sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsidm.8 +sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dscreate.8 # tests %py3_build @@ -514,7 +514,6 @@ if [ $1 -eq 0 ]; then # Final removal fi %postun -/sbin/ldconfig if [ $1 = 0 ]; then # Final removal rm -rf /var/run/%{pkgname} fi @@ -632,16 +631,6 @@ exit 0 # We have to seperate this from being a glob to ensure the caps are applied. %caps(CAP_NET_BIND_SERVICE=pe) %{_sbindir}/ns-slapd %{_mandir}/man8/ns-slapd.8.gz -%if 0%{?rhel} > 7 || 0%{?fedora} -%{_sbindir}/dsconf -%{_mandir}/man8/dsconf.8.gz -%{_sbindir}/dscreate -%{_mandir}/man8/dscreate.8.gz -%{_sbindir}/dsctl -%{_mandir}/man8/dsctl.8.gz -%{_sbindir}/dsidm -%{_mandir}/man8/dsidm.8.gz -%endif %{_libexecdir}/%{pkgname}/ds_selinux_enabled %{_libexecdir}/%{pkgname}/ds_selinux_port_query %{_libexecdir}/%{pkgname}/ds_systemd_ask_password_acl @@ -824,6 +813,14 @@ exit 0 %defattr(-,root,root,-) %doc LICENSE LICENSE.GPLv3+ %{python3_sitelib}/lib389* +%{_sbindir}/dsconf +%{_mandir}/man8/dsconf.8.gz +%{_sbindir}/dscreate +%{_mandir}/man8/dscreate.8.gz +%{_sbindir}/dsctl +%{_mandir}/man8/dsctl.8.gz +%{_sbindir}/dsidm +%{_mandir}/man8/dsidm.8.gz %files -n python%{python3_pkgversion}-%{srcname}-tests %defattr(-,root,root,-) diff --git a/src/lib389/setup.cfg b/src/lib389/setup.cfg index a447461..48a4a16 100644 --- a/src/lib389/setup.cfg +++ b/src/lib389/setup.cfg @@ -1,7 +1,7 @@ [build_manpages] manpages = - ../../man/man8/dsconf.8:object=parser:pyfile=cli/dsconf - ../../man/man8/dsctl.8:object=parser:pyfile=cli/dsctl - ../../man/man8/dsidm.8:object=parser:pyfile=cli/dsidm - ../../man/man8/dscreate.8:object=parser:pyfile=cli/dscreate + man/dsconf.8:object=parser:pyfile=cli/dsconf + man/dsctl.8:object=parser:pyfile=cli/dsctl + man/dsidm.8:object=parser:pyfile=cli/dsidm + man/dscreate.8:object=parser:pyfile=cli/dscreate diff --git a/src/lib389/setup.py b/src/lib389/setup.py index 52122b6..bef89eb 100644 --- a/src/lib389/setup.py +++ b/src/lib389/setup.py @@ -66,6 +66,12 @@ setup( 'cli/dscreate', 'cli/dsidm', ]), + ('/usr/share/man/man8', [ + 'man/dsctl.8', + 'man/dsconf.8', + 'man/dscreate.8', + 'man/dsidm.8', + ]), ], install_requires=[