diff options
| -rw-r--r-- | src/MANIFEST.in | 2 | ||||
| -rw-r--r-- | src/Makefile | 21 | ||||
| -rw-r--r-- | src/setup.cfg | 2 | ||||
| -rw-r--r-- | src/setup.py | 2 | ||||
| -rw-r--r-- | src/sos.spec | 12 |
5 files changed, 18 insertions, 21 deletions
diff --git a/src/MANIFEST.in b/src/MANIFEST.in index a59897ca..e227a7dc 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 LICENSE TODO sosreport sosreport.1.gz MANIFEST.in +include README LICENSE TODO ChangeLog sosreport sosreport.1 MANIFEST.in diff --git a/src/Makefile b/src/Makefile index 6102843a..6d918865 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,11 +16,10 @@ diff-tag-release: svn diff $(REPO)/trunk/src $(REPO)/tags/$(SVNTAG) tag-release: - svn list $(REPO)/tags/$(SVNTAG)/Makefile 2> /dev/null && \ - ( \ + @if ( svn list $(REPO)/tags/$(SVNTAG)/Makefile &> /dev/null ); then \ echo "The repository already contains a tag for version $(VERSION)"; \ exit 1; \ - ) + fi @svn copy $(REPO)/trunk/src $(REPO)/tags/$(SVNTAG) \ -m "Tagging the $(SVNTAG) release of the sos project" @echo "Tagged as $(SVNTAG)" @@ -31,26 +30,22 @@ tarball: clean @svn export -q $(REPO)/trunk/src /tmp/$(NAME) \ || echo GRRRrrrrr -- ignore [export aborted] @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION) - @cd /tmp/$(NAME)-$(VERSION); gzip -c sosreport.1 > sosreport.1.gz @cd /tmp; tar --bzip2 -cSpf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) @rm -rf /tmp/$(NAME)-$(VERSION) - @cp /tmp/$(NAME)-$(VERSION).tar.bz2 . - @rm -f /tmp/$(NAME)-$(VERSION).tar.bz2 + @mv /tmp/$(NAME)-$(VERSION).tar.bz2 . @echo " " @echo "The final archive is ./$(NAME)-$(VERSION).tar.bz2." release: clean -# @svn list $(REPO)/tags/$(SVNTAG)/Makefile > /dev/null || \ -# ( \ -# @echo "There is no tag in the repository for this version, must be tagged before release"; \ -# exit 1; \ -# ) + @if ( ! svn list $(REPO)/tags/$(SVNTAG)/Makefile &> /dev/null ); then \ + echo "There is no tag in the repository for this version, must be tagged before release"; \ + exit 1; \ + fi @echo "Creating an archive from tag $(SVNTAG)" @rm -rf /tmp/$(NAME) @svn export -q $(REPO)/tags/$(SVNTAG) /tmp/$(NAME) \ || echo GRRRrrrrr -- ignore [export aborted] @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION) - @cd /tmp/$(NAME)-$(VERSION); gzip -c sosreport.1 > sosreport.1.gz @cd /tmp; tar --bzip2 -cSpf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) @rm -rf /tmp/$(NAME)-$(VERSION) @cp /tmp/$(NAME)-$(VERSION).tar.bz2 . @@ -68,4 +63,4 @@ clean: @rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 sosreport.1.gz rpm: - python setup.py bdist_rpm + rpmbuild -ba sos.spec diff --git a/src/setup.cfg b/src/setup.cfg index 3ed60417..624e8a00 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -7,7 +7,7 @@ template = MANIFEST.in [bdist_rpm] release = 4 build_requires = python-devel -doc_files = README TODO LICENSE +doc_files = README TODO LICENSE ChangeLog prep_script = prep-rpm.sh install_script = install-rpm.sh vendor = none diff --git a/src/setup.py b/src/setup.py index 4aca9e4c..b6030227 100644 --- a/src/setup.py +++ b/src/setup.py @@ -23,5 +23,5 @@ support technicians and developers.""", 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.gz']) ] + data_files = [('/usr/sbin', ['sosreport']), ('/usr/share/man/man1', ['sosreport.1']) ] ) diff --git a/src/sos.spec b/src/sos.spec index 928577cd..24e0dced 100644 --- a/src/sos.spec +++ b/src/sos.spec @@ -2,7 +2,7 @@ %define name sos %define version 1.6 -%define release 4 +%define release 5 Summary: A set of tools to gather troubleshooting information from a system Name: %{name} @@ -10,8 +10,8 @@ Version: %{version} Release: %{release}%{?dist} # The source for this package was pulled from upstream's svn. Use the # following commands to generate the tarball: -# svn --username guest export https://sos.108.redhat.com/svn/sos/tags/r1-6 sosreport-1.6 -# tar -czvf sosreport-1.6.tar.gz sosreport-1.6 +# svn --username guest export https://sos.108.redhat.com/svn/sos/tags/r1-6 sos-1.6 +# tar -czvf sos-1.6.tar.gz sos-1.6 Source0: %{name}-%{version}.tar.gz License: GPL Group: Development/Libraries @@ -29,7 +29,6 @@ support technicians and developers. %prep %setup -q - %build python setup.py build @@ -45,9 +44,12 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/sosreport %{python_sitelib}/sos/ %{_mandir}/man1/sosreport.1* -%doc README TODO LICENSE +%doc README TODO LICENSE ChangeLog %changelog +* Mon Jul 5 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-5 +- Yet more fixes to make package Fedora compliant. + * Mon Jul 5 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-4 - More fixes to make package Fedora compliant. |