PR#49823: Ticket 49811 - lib389 setup.py should install autogenerated man pages - 389-ds-base

389-ds-base

#49823 Ticket 49811 - lib389 setup.py should install autogenerated man pages

Closed 3 years ago by spichugi. Opened 5 years ago by mreynolds.

mreynolds/389-ds-base ticket49811 into master

Ticket 49811 - lib389 setup.py should install autogenerated man pages

Mark Reynolds • 5 years ago

4404d03

Makefile.am

file modified

-4

		`@@ -974,10 +974,6 @@`
		`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 \`

rpm/389-ds-base.spec.in

file modified

+12 -15

		`@@ -393,10 +393,10 @@`
		`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 @@`
		`fi`

		`%postun`
		`- /sbin/ldconfig`
		`if [ $1 = 0 ]; then # Final removal`
		`rm -rf /var/run/%{pkgname}`
		`fi`
		`@@ -632,16 +631,6 @@`
		`# 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 @@`
		`%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,-)`

src/lib389/setup.cfg

file modified

+4 -4

		`@@ -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`

src/lib389/setup.py

file modified

		`@@ -66,6 +66,12 @@`
		`'cli/dscreate',`
		`'cli/dsidm',`
		`]),`
		`+ ('/usr/share/man/man8', [`
		`+ 'man/dsctl.8',`
		`+ 'man/dsconf.8',`
		`+ 'man/dscreate.8',`
		`+ 'man/dsidm.8',`
		`+ ]),`
		`],`

		`install_requires=[`

mreynolds commented 5 years ago

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: ?

vashirov commented on line 45 of rpm/389-ds-base.spec.in 5 years ago

This should be under lib389, not under tests. Otherwise, ds* tools and manpages are installed in tests rpm:

[root@server ds]# rpm -ql dist/rpms/python3-389-ds-base-tests-1.4.0.11-20180702git65413da23.fc28.noarch.rpm  | grep dsc   
/usr/sbin/dsconf
/usr/sbin/dscreate
/usr/sbin/dsctl
/usr/share/man/man8/dsconf.8.gz
/usr/share/man/man8/dscreate.8.gz
/usr/share/man/man8/dsctl.8.gz

rebased onto 4404d03

5 years ago

mreynolds commented 5 years ago

@vashirov nice catch - fixed...

vashirov commented 5 years ago

LGTM

Pull-Request has been merged by mreynolds

5 years ago