diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 9 | ||||
| -rw-r--r-- | src/setup.py | 2 | ||||
| -rw-r--r-- | src/sos.spec | 28 |
3 files changed, 22 insertions, 17 deletions
diff --git a/src/Makefile b/src/Makefile index b87d7d14..a480fd12 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,10 +3,9 @@ # NAME = sos -VERSION = $(shell awk '/define version/ { print $$3 }' sos.spec) -RELEASE = $(shell awk '/define release/ { print $$3 }' sos.spec) +VERSION = $(shell awk '/Version/ { print $$2 }' sos.spec) REPO = https://sos.108.redhat.com/svn/sos -SVNTAG = r$(subst .,-,$(VERSION)-$(RELEASE)) +SVNTAG = r$(subst .,-,$(VERSION)) all: @@ -39,7 +38,7 @@ install: python setup.py install version: - @echo "The version is $(NAME)-$(VERSION)-$(RELEASE)" + @echo "The version is $(NAME)-$(VERSION)" clean: - @rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION)-$(RELEASE).tar.bz2 + @rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 diff --git a/src/setup.py b/src/setup.py index 8c39f621..08ab4404 100644 --- a/src/setup.py +++ b/src/setup.py @@ -10,7 +10,7 @@ import sys,os,time # change release in spec file along with this version string setup( name = 'sos', - version = '0.1.10', + version = '1.0', 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 index c0217de2..3ebe5b5b 100644 --- a/src/sos.spec +++ b/src/sos.spec @@ -1,16 +1,19 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?python_siteinc: %define python_siteinc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")} +#NEEDSWORK: +#- Your upstream software release number is different from the rpm release +#number. Upstream release is the rpm version. rpm release would be how many +#times we've had to respin this version of the software for various reasons +#(build system changes, gcc changes, spec bug fixes, etc...) The two should +#_not_ be tied together. +#- Changelog entry doesn't match release number. (10 vs 11) +#- %setup section should have -q. -%define name sos -%define version 0.1 -# change release in setup.py and this file -%define release 10 +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: System Support Tools -Name: %{name} -Version: %{version} -Release: %{release}%{?dist} +Name: sos +Version: 1.0 +# change release in setup.py and this file +Release: 10%{?dist} License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,7 +31,7 @@ support technicians and developers. %prep -%setup +%setup -q %build python setup.py -q build @@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %doc README TODO %changelog +* 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 |