diff options
| -rw-r--r-- | src/Makefile | 10 | ||||
| -rw-r--r-- | src/setup.cfg | 91 | ||||
| -rw-r--r-- | src/setup.py | 3 | ||||
| -rw-r--r-- | src/sos.spec | 124 |
4 files changed, 96 insertions, 132 deletions
diff --git a/src/Makefile b/src/Makefile index f58a359e..1b93d7f6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,7 +3,7 @@ # NAME = sos -VERSION = $(shell awk '/Version/ { print $$2 }' sos.spec) +VERSION = $(shell grep -e 'version = ' setup.py |cut -d \' -f 2) REPO = https://sos.108.redhat.com/svn/sos SVNTAG = r$(subst .,-,$(VERSION)) SVN_TAG_CONTENTS := $(shell svn list $(REPO)/tags/$(SVNTAG)/Makefile) @@ -16,11 +16,12 @@ all: tag-release: ifeq ($(strip $(SVN_TAG_CONTENTS)), Makefile) @echo "The repository already contains a tag for version $(VERSION)" + @exit 1 else @svn copy $(REPO)/trunk/src $(REPO)/tags/$(SVNTAG) \ -m "Tagging the $(SVNTAG) release of the sos project" - @echo "$(SVNTAG)" - @svn update ../../tags + @echo "Tagged as $(SVNTAG)" + SVN_TAG_CONTENTS := $(shell svn list $(REPO)/tags/$(SVNTAG)/Makefile) endif # if we don't compress them, rpmbuild does, and this breaks things @@ -67,3 +68,6 @@ version: clean: @rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 sosreport.1.gz + +rpm: + python setup.py bdist_rpm diff --git a/src/setup.cfg b/src/setup.cfg index df8d4329..04cf3f47 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -5,9 +5,92 @@ template = MANIFEST.in [bdist_rpm] -provides = sos -requires = python >= 0:2.3 -release = 1 -packager = Steve Conklin <sconklin@redhat.com> +release = 2 +build_requires = python-devel +packager = Navid Sheikhol-Eslami <navid@redhat.com> doc_files = README TODO LICENSE install_script = install-rpm.sh +changelog = * Mon Jul 2 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-2 + - Minor fixes. + + * Mon Jul 2 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-1 + - Beautified output of --list-plugins. + - GPL licence is now included in the package. + - added python-devel requirement for building package + - fixed incompatibility with python from RHEL4 + + * Fri May 25 2007 Steve Conklin <sconklin at redhat dot com> - 1.5-1 + - Bumped version + + * Fri May 25 2007 Steve Conklin <sconklin at redhat dot com> - 1.4-2 + - Fixed a backtrace on nonexistent file in kernel plugin (thanks, David Robinson) + + * Mon Apr 30 2007 Steve Conklin <sconklin at redhat dot com> - 1.4-1 + - Fixed an error in option handling + - Forced the file generated by traceroute to not end in .com + - Fixed a problem with manpage + - Added optional traceroute collection to networking plugin + - Added clalance's patch to gather iptables info. + - Fixes to the device-mapper plugin + - Fixed a problem with installation of man page + + * Mon Apr 16 2007 Steve Conklin <sconklin at redhat dot com> - 1.3-3 + - including patches to fix the following: + - Resolves: bz219745 sosreport needs a man page + - Resolves: bz219667 sosreport does not terminate cleanly on ^C + - Resolves: bz233375 Make SOS flag the situation when running on a fully virtu... + - Resolves: bz234873 rhel5 sos needs to include rpm-va by default + - Resolves: bz219669 sosreport multi-threaded option sometimes fails + - Resolves: bz219671 RFE for sosreport - allow specification of plugins to be run + - Resolves: bz219672 RFE - show progress while sosreport is running + - Resolves: bz219673 Add xen information gathering to sosreport + - Resolves: bz219675 Collect information related to the new driver update model + - Resolves: bz219877 'Cancel' button during option selection only cancels sele... + + * Tue Feb 20 2007 John Berninger <jwb at redhat dot com> - 1.3-2 + - Add man page + + * Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.3-1 + - really fixed bz_219654 + + * Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.2-1 + - fixed a build problem + + * Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.1-1 + - Tighten permissions of tmp directory so only readable by creator bz_219657 + - Don't print message 'Problem at path ...' bz_219654 + - Removed useless message bz_219670 + - Preserve file modification times bz_219674 + - Removed unneeded message about files on copyProhibitedList bz_219712 + + * Wed Aug 30 2006 Steve Conklin <sconklin at redhat dot com> - 1.0-1 + - Seperated upstream and RPM versioning + + * Mon Aug 21 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-11 + - Code cleanup, fixed a regression in threading + + * Mon Aug 14 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-10 + - minor bugfixes, added miltithreading option, setup now quiet + + * Mon Jul 17 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-9 + - migrated to svn on 108.redhat.com, fixed a problem with command output linking in report + + * Mon Jun 19 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-6 + - Added LICENSE file containing GPL + + * Wed May 31 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-5 + - Added fixes to network plugin and prepped for Fedora submission + + * Wed May 31 2006 John Berninger <jwb at redhat dot com> - 0.1-4 + - Reconsolidated subpackages into one package per discussion with sconklin + + * Mon May 22 2006 John Berninger <jwb at redhat dot com> - 0.1-3 + - Added ftp, ldap, mail, named, samba, squid SOS plugins + - Fixed various errors in kernel and hardware plugins + + * Mon May 22 2006 John Benringer <jwb at redhat dot com> - 0.1-2 + - split off cluster plugin into subpackage + - correct file payload lists + + * Mon May 22 2006 John Berninger <jwb at redhat dot com> - 0.1-1 + - initial package build diff --git a/src/setup.py b/src/setup.py index 11c10e67..88d0add5 100644 --- a/src/setup.py +++ b/src/setup.py @@ -9,7 +9,8 @@ import sys,os,time # change version in spec file along with this string setup( name = 'sos', - version = '1.5', + version = '1.6', + license = 'GPL', description = 'System Support Tools', long_description = """Sos is a set of tools that gathers information about system hardware and configuration. The information can then be used for diff --git a/src/sos.spec b/src/sos.spec deleted file mode 100644 index ce3ad11e..00000000 --- a/src/sos.spec +++ /dev/null @@ -1,124 +0,0 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -Summary: System Support Tools -Name: sos -Version: 1.5 -Release: 1%{?dist} -License: GPL -Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: python-devel -URL: http://sos.108.redhat.com -# Using local source tarball until this can be released to public CVS system -Source0: %{name}-%{version}.tar.bz2 - -%description -SOS is a set of tools that gathers information about system -hardware and configuration. The information can then be used for -diagnostic purposes and debugging. Sos is commonly used to help -support technicians and developers. - - -%prep -%setup -q - -%build -python setup.py -q build - -%install -rm -rf ${RPM_BUILD_ROOT} -# The python setup.py does the same thing as the make install in other packages -%{__python} setup.py -q install --root=${RPM_BUILD_ROOT} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%{_sbindir}/sosreport -%dir %{python_sitelib}/sos/ -%{python_sitelib}/sos/plugins -%{python_sitelib}/sos/plugintools.py* -%{python_sitelib}/sos/__init__.py* -%{python_sitelib}/sos/helpers.py* -%{python_sitelib}/sos/policyredhat.py* -%{_mandir}/man1/sosreport.1.gz -%doc README TODO - -%changelog -* Fri May 25 2007 Steve Conklin <sconklin at redhat dot com> - 1.5-1 -- Bumped version - -* Fri May 25 2007 Steve Conklin <sconklin at redhat dot com> - 1.4-2 -- Fixed a backtrace on nonexistent file in kernel plugin (thanks, David Robinson) - -* Mon April 30 2007 Steve Conklin <sconklin at redhat dot com> - 1.4-1 -- Fixed an error in option handling -- Forced the file generated by traceroute to not end in .com -- Fixed a problem with manpage -- Added optional traceroute collection to networking plugin -- Added clalance's patch to gather iptables info. -- Fixes to the device-mapper plugin -- Fixed a problem with installation of man page - -* Mon Apr 16 2007 Steve Conklin <sconklin at redhat dot com> - 1.3-3 -- including patches to fix the following: -- Resolves: bz219745 sosreport needs a man page -- Resolves: bz219667 sosreport does not terminate cleanly on ^C -- Resolves: bz233375 Make SOS flag the situation when running on a fully virtu... -- Resolves: bz234873 rhel5 sos needs to include rpm-va by default -- Resolves: bz219669 sosreport multi-threaded option sometimes fails -- Resolves: bz219671 RFE for sosreport - allow specification of plugins to be run -- Resolves: bz219672 RFE - show progress while sosreport is running -- Resolves: bz219673 Add xen information gathering to sosreport -- Resolves: bz219675 Collect information related to the new driver update model -- Resolves: bz219877 'Cancel' button during option selection only cancels sele... - -* Tue Feb 20 2007 John Berninger <jwb at redhat dot com> - 1.3-2 -- Add man page - -* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.3-1 -- really fixed bz_219654 - -* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.2-1 -- fixed a build problem - -* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.1-1 -- Tighten permissions of tmp directory so only readable by creator bz_219657 -- Don't print message 'Problem at path ...' bz_219654 -- Removed useless message bz_219670 -- Preserve file modification times bz_219674 -- Removed unneeded message about files on copyProhibitedList bz_219712 - -* Wed Aug 30 2006 Steve Conklin <sconklin at redhat dot com> - 1.0-1 -- Seperated upstream and RPM versioning - -* Mon Aug 21 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-11 -- Code cleanup, fixed a regression in threading - -* Mon Aug 14 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-10 -- minor bugfixes, added miltithreading option, setup now quiet - -* Mon Jul 17 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-9 -- migrated to svn on 108.redhat.com, fixed a problem with command output linking in report - -* Mon Jun 19 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-6 -- Added LICENSE file containing GPL - -* Wed May 31 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-5 -- Added fixes to network plugin and prepped for Fedora submission - -* Wed May 31 2006 John Berninger <jwb at redhat dot com> - 0.1-4 -- Reconsolidated subpackages into one package per discussion with sconklin - -* Mon May 22 2006 John Berninger <jwb at redhat dot com> - 0.1-3 -- Added ftp, ldap, mail, named, samba, squid SOS plugins -- Fixed various errors in kernel and hardware plugins - -* Mon May 22 2006 John Benringer <jwb at redhat dot com> - 0.1-2 -- split off cluster plugin into subpackage -- correct file payload lists - -* Mon May 22 2006 John Berninger <jwb at redhat dot com> - 0.1-1 -- initial package build |