diff options
| author | astokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2008-12-29 11:53:05 +0000 |
|---|---|---|
| committer | astokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2008-12-29 11:53:05 +0000 |
| commit | 55347f3f2327a401424d3ad4e066e7ba8e2a6aad (patch) | |
| tree | 446e79a4b616f196effb71f7ead0dbd3aaf04ba2 | |
| parent | 7254e2f2ff04b254bb10f63c35fd4c836b80413a (diff) | |
| download | sos-55347f3f2327a401424d3ad4e066e7ba8e2a6aad.tar.gz | |
- removed some source defines in spec, everything should build properly
now
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@548 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/sos.spec | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index 1fd60c81..c961bbff 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,8 +3,8 @@ # NAME = sos -VERSION = $(shell awk '/^%define version / { print $$3 }' sos.spec) -RELEASE = $(shell awk '/^%define release / { print $$3 }' sos.spec) +VERSION = 1.8 +RELEASE = 5 REPO = http://svn.fedorahosted.org/svn/sos SVNTAG = r$(subst .,-,$(VERSION))_$(RELEASE) SRCDIR = $(PWD) @@ -26,7 +26,6 @@ tarball: clean mo gpgkey @test -f $(SOURCE2) || gzip -c $(MANPAGE) > $(SOURCE2) @mkdir $(TMPDIR) @python setup.py sdist -d $(TMPDIR) - @cp {$(SOURCE1),$(SOURCE2),$(SOURCE3)} $(TMPDIR) @mkdir $(PWD)/dist @cp $(TMPDIR)/* $(PWD)/dist @echo " " diff --git a/src/sos.spec b/src/sos.spec index 39d907e2..b66eca4a 100644 --- a/src/sos.spec +++ b/src/sos.spec @@ -5,12 +5,9 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 1.8 -Release: 4%{?dist} +Release: 5%{?dist} Group: Application/Tools Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz -Source1: sos.conf -Source2: rhsupport.pub -Source3: sosreport.1.gz License: GPLv2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch @@ -56,6 +53,9 @@ rm -rf ${RPM_BUILD_ROOT} %config %{_sysconfdir}/sos.conf %changelog +* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5 +- removed source defines as python manifest handles this + * Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 1.8-4 - spec cleanup, fixed license, source - reworked Makefile to build properly |