diff options
author | Petr Spacek <pspacek@redhat.com> | 2016-11-04 13:36:45 +0100 |
---|---|---|
committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-09 13:08:32 +0100 |
commit | dc5699a8a40dd27ffd25d9ad3185ba40d93ec95b (patch) | |
tree | 365cf18540e810c8e3045cdc4f399422bcd66026 | |
parent | cc6382550fcf32bd4b843c922c10c5a5d247dd38 (diff) | |
download | freeipa-dc5699a8a40dd27ffd25d9ad3185ba40d93ec95b.tar.gz freeipa-dc5699a8a40dd27ffd25d9ad3185ba40d93ec95b.tar.xz freeipa-dc5699a8a40dd27ffd25d9ad3185ba40d93ec95b.zip |
Build: do not compress manual pages at install time
At the time of this writting
https://fedoraproject.org/wiki/Packaging:Guidelines#Manpages
says this:
When installing man pages, note that they should be installed uncompressed
as the build system will compress them as needed. The compression method
may change, so it is important to reference the pages in the %files section
with a pattern that takes this into account:
%{_mandir}/man1/foo.1*
Removing the compression also allows to remove several install-data-hook
targets from Makefile.am files.
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
-rw-r--r-- | client/man/Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | freeipa.spec.in | 70 | ||||
-rw-r--r-- | install/tools/man/Makefile.am | 4 | ||||
-rw-r--r-- | ipatests/man/Makefile.am | 3 |
5 files changed, 35 insertions, 49 deletions
diff --git a/client/man/Makefile.am b/client/man/Makefile.am index f81f10f47..fbee4d38b 100644 --- a/client/man/Makefile.am +++ b/client/man/Makefile.am @@ -15,10 +15,6 @@ dist_man1_MANS = \ dist_man5_MANS = \ default.conf.5 - -install-data-hook: - @for i in $(man1_MANS) ; do gzip -f $(DESTDIR)$(man1dir)/$$i ; done - @for i in $(man5_MANS) ; do gzip -f $(DESTDIR)$(man5dir)/$$i ; done MAINTAINERCLEANFILES = \ Makefile.in \ diff --git a/configure.ac b/configure.ac index 0fafe0d38..d6322b794 100644 --- a/configure.ac +++ b/configure.ac @@ -499,9 +499,6 @@ AC_CONFIG_FILES([ util/Makefile ]) -dnl GZIP is used for compressing manual pages -AC_CHECK_PROG([GZIP], [gzip], [yes], [AC_MSG_ERROR(gzip not found)]) - AC_OUTPUT echo " diff --git a/freeipa.spec.in b/freeipa.spec.in index 9f6e428ec..c64a74600 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -1058,28 +1058,28 @@ fi %attr(755,root,root) %{plugin_dir}/libipa_sidgen_task.so %attr(755,root,root) %{plugin_dir}/libipa_extdom_extop.so %attr(755,root,root) %{_libdir}/krb5/plugins/kdb/ipadb.so -%{_mandir}/man1/ipa-replica-conncheck.1.gz -%{_mandir}/man1/ipa-replica-install.1.gz -%{_mandir}/man1/ipa-replica-manage.1.gz -%{_mandir}/man1/ipa-csreplica-manage.1.gz -%{_mandir}/man1/ipa-replica-prepare.1.gz -%{_mandir}/man1/ipa-server-certinstall.1.gz -%{_mandir}/man1/ipa-server-install.1.gz -%{_mandir}/man1/ipa-server-upgrade.1.gz -%{_mandir}/man1/ipa-ca-install.1.gz -%{_mandir}/man1/ipa-kra-install.1.gz -%{_mandir}/man1/ipa-compat-manage.1.gz -%{_mandir}/man1/ipa-nis-manage.1.gz -%{_mandir}/man1/ipa-managed-entries.1.gz -%{_mandir}/man1/ipa-ldap-updater.1.gz -%{_mandir}/man8/ipactl.8.gz -%{_mandir}/man8/ipa-upgradeconfig.8.gz -%{_mandir}/man1/ipa-backup.1.gz -%{_mandir}/man1/ipa-restore.1.gz -%{_mandir}/man1/ipa-advise.1.gz -%{_mandir}/man1/ipa-otptoken-import.1.gz -%{_mandir}/man1/ipa-cacert-manage.1.gz -%{_mandir}/man1/ipa-winsync-migrate.1.gz +%{_mandir}/man1/ipa-replica-conncheck.1* +%{_mandir}/man1/ipa-replica-install.1* +%{_mandir}/man1/ipa-replica-manage.1* +%{_mandir}/man1/ipa-csreplica-manage.1* +%{_mandir}/man1/ipa-replica-prepare.1* +%{_mandir}/man1/ipa-server-certinstall.1* +%{_mandir}/man1/ipa-server-install.1* +%{_mandir}/man1/ipa-server-upgrade.1* +%{_mandir}/man1/ipa-ca-install.1* +%{_mandir}/man1/ipa-kra-install.1* +%{_mandir}/man1/ipa-compat-manage.1* +%{_mandir}/man1/ipa-nis-manage.1* +%{_mandir}/man1/ipa-managed-entries.1* +%{_mandir}/man1/ipa-ldap-updater.1* +%{_mandir}/man8/ipactl.8* +%{_mandir}/man8/ipa-upgradeconfig.8* +%{_mandir}/man1/ipa-backup.1* +%{_mandir}/man1/ipa-restore.1* +%{_mandir}/man1/ipa-advise.1* +%{_mandir}/man1/ipa-otptoken-import.1* +%{_mandir}/man1/ipa-cacert-manage.1* +%{_mandir}/man1/ipa-winsync-migrate.1* %files -n python2-ipaserver -f server-python.list @@ -1203,7 +1203,7 @@ fi %doc README Contributors.txt %license COPYING %{_sbindir}/ipa-dns-install -%{_mandir}/man1/ipa-dns-install.1.gz +%{_mandir}/man1/ipa-dns-install.1* %files server-trust-ad @@ -1213,7 +1213,7 @@ fi %{_sbindir}/ipa-adtrust-install %{_usr}/share/ipa/smb.conf.empty %attr(755,root,root) %{_libdir}/samba/pdb/ipasam.so -%{_mandir}/man1/ipa-adtrust-install.1.gz +%{_mandir}/man1/ipa-adtrust-install.1* %ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so %{_sysconfdir}/dbus-1/system.d/oddjob-ipa-trust.conf %{_sysconfdir}/oddjobd.conf.d/oddjobd-ipa-trust.conf @@ -1234,13 +1234,13 @@ fi %{_sbindir}/ipa-join %{_bindir}/ipa %config %{_sysconfdir}/bash_completion.d -%{_mandir}/man1/ipa.1.gz -%{_mandir}/man1/ipa-getkeytab.1.gz -%{_mandir}/man1/ipa-rmkeytab.1.gz -%{_mandir}/man1/ipa-client-install.1.gz -%{_mandir}/man1/ipa-client-automount.1.gz -%{_mandir}/man1/ipa-certupdate.1.gz -%{_mandir}/man1/ipa-join.1.gz +%{_mandir}/man1/ipa.1* +%{_mandir}/man1/ipa-getkeytab.1* +%{_mandir}/man1/ipa-rmkeytab.1* +%{_mandir}/man1/ipa-client-install.1* +%{_mandir}/man1/ipa-client-automount.1* +%{_mandir}/man1/ipa-certupdate.1* +%{_mandir}/man1/ipa-join.1* %files -n python2-ipaclient @@ -1291,7 +1291,7 @@ fi %dir %{_usr}/share/ipa %dir %{_localstatedir}/lib/ipa-client %dir %{_localstatedir}/lib/ipa-client/sysrestore -%{_mandir}/man5/default.conf.5.gz +%{_mandir}/man5/default.conf.5* %files python-compat @@ -1371,9 +1371,9 @@ fi %{_bindir}/ipa-test-config-%{python2_version} %{_bindir}/ipa-test-task-%{python2_version} %{python_sitelib}/ipatests-*.egg-info -%{_mandir}/man1/ipa-run-tests.1.gz -%{_mandir}/man1/ipa-test-config.1.gz -%{_mandir}/man1/ipa-test-task.1.gz +%{_mandir}/man1/ipa-run-tests.1* +%{_mandir}/man1/ipa-test-config.1* +%{_mandir}/man1/ipa-test-task.1* %if 0%{?with_python3} diff --git a/install/tools/man/Makefile.am b/install/tools/man/Makefile.am index 6243a9d94..d2b3195ff 100644 --- a/install/tools/man/Makefile.am +++ b/install/tools/man/Makefile.am @@ -34,10 +34,6 @@ dist_man8_MANS = \ ipa-upgradeconfig.8 \ $(NULL) -install-data-hook: - @for i in $(man1_MANS) ; do gzip -f $(DESTDIR)$(man1dir)/$$i ; done - @for i in $(man8_MANS) ; do gzip -f $(DESTDIR)$(man8dir)/$$i ; done - MAINTAINERCLEANFILES = \ Makefile.in \ $(NULL) diff --git a/ipatests/man/Makefile.am b/ipatests/man/Makefile.am index 23a91f0a5..6b79128b4 100644 --- a/ipatests/man/Makefile.am +++ b/ipatests/man/Makefile.am @@ -10,9 +10,6 @@ dist_man1_MANS = \ ipa-test-task.1 \ $(NULL) -install-data-hook: - @for i in $(man1_MANS) ; do gzip -f $(DESTDIR)$(man1dir)/$$i ; done - MAINTAINERCLEANFILES = \ Makefile.in \ $(NULL) |