diff options
| author | sconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-04-20 19:29:30 +0000 |
|---|---|---|
| committer | sconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-04-20 19:29:30 +0000 |
| commit | d40dab09ba602c1b08aac08495f825058c26e321 (patch) | |
| tree | d267ecaf7f2f955897b1ec0a0e408f6ac0acba0c | |
| parent | 7cd05b634be1c5cb0d23f4e264871106dcd60c5c (diff) | |
| download | sos-d40dab09ba602c1b08aac08495f825058c26e321.tar.gz | |
Fixed a problem with installation of man page. rpmbuild compresses
the man page, which changed the file name and caused a failure. Now
we just compress it first and deliver it that way.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@124 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | src/MANIFEST.in | 2 | ||||
| -rw-r--r-- | src/Makefile | 10 | ||||
| -rw-r--r-- | src/setup.py | 2 | ||||
| -rw-r--r-- | src/sos.spec | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/MANIFEST.in b/src/MANIFEST.in index 8c858b64..db412457 100644 --- a/src/MANIFEST.in +++ b/src/MANIFEST.in @@ -1,4 +1,4 @@ # NOTE: Including sosreport here is a hack. This # is done because the data_files handling from setup.py # is broken for building dists (at least in Python 2.3) -include README TODO sosreport sosreport.1 MANIFEST.in +include README TODO sosreport sosreport.1.gz MANIFEST.in diff --git a/src/Makefile b/src/Makefile index 51efce99..3581d84e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,7 +23,11 @@ else @svn update ../../tags endif -tarball: clean +# if we don't compress them, rpmbuild does, and this breaks things +manpages: sosreport.1 + @gzip -c sosreport.1 > sosreport.1.gz + +tarball: clean manpages @echo "Creating an archive from HEAD of development" @rm -rf /tmp/$(NAME) @svn export -q $(REPO)/trunk/src /tmp/$(NAME) \ @@ -36,7 +40,7 @@ tarball: clean @echo " " @echo "The final archive is ./$(NAME)-$(VERSION).tar.bz2." -release: clean tag-release +release: clean tag-release manpages ifeq ($(strip $(SVN_TAG_CONTENTS)), Makefile) @echo "Creating an archive from tag $(SVNTAG)" @rm -rf /tmp/$(NAME) @@ -60,4 +64,4 @@ version: @echo "The version is $(NAME)-$(VERSION)" clean: - @rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 + @rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 sosreport.1.gz diff --git a/src/setup.py b/src/setup.py index c432fe59..47c1f129 100644 --- a/src/setup.py +++ b/src/setup.py @@ -22,5 +22,5 @@ setup( scripts = [], package_dir = {'': 'lib',}, # data_files is broken for building dists, works for installs - data_files = [('/usr/sbin', ['sosreport']), ('/usr/share/man/man1', ['sosreport.1']) ] + data_files = [('/usr/sbin', ['sosreport']), ('/usr/share/man/man1', ['sosreport.1.gz']) ] ) diff --git a/src/sos.spec b/src/sos.spec index 157e73ad..5dcbc5ed 100644 --- a/src/sos.spec +++ b/src/sos.spec @@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/sos/__init__.py* %{python_sitelib}/sos/helpers.py* %{python_sitelib}/sos/policyredhat.py* -%{_mandir}/man1/sosreport.1 +%{_mandir}/man1/sosreport.1.gz %doc README TODO %changelog |