aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-07-05 09:05:06 +0000
committershnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-07-05 09:05:06 +0000
commit513e30ce0e05322758f6521207591901b6050f2e (patch)
treec3687512aaccec13d7a4738e317579a7086d527b
parent1dc09ad7a97d80130f72969ac6c0bba091a552ed (diff)
downloadsos-513e30ce0e05322758f6521207591901b6050f2e.tar.gz
* more fixes in sos.spec for Fedora
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@175 ef72aa8b-4018-0410-8976-d6e080ef94d8
-rw-r--r--src/Makefile3
-rw-r--r--src/setup.cfg3
-rw-r--r--src/sos.spec10
3 files changed, 12 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index 1de40c84..e22d7f08 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,6 +12,9 @@ all:
.PHONY: tag-release tarball release install version clean
+diff-tag-release:
+ svn diff $(REPO)/trunk/src $(REPO)/tags/$(SVNTAG)
+
tag-release:
@svn list $(REPO)/tags/$(SVNTAG)/Makefile > /dev/null && \
( \
diff --git a/src/setup.cfg b/src/setup.cfg
index 33cf02fd..3ed60417 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -5,9 +5,8 @@
template = MANIFEST.in
[bdist_rpm]
-release = 3
+release = 4
build_requires = python-devel
-packager = Navid Sheikhol-Eslami <navid@redhat.com>
doc_files = README TODO LICENSE
prep_script = prep-rpm.sh
install_script = install-rpm.sh
diff --git a/src/sos.spec b/src/sos.spec
index 025b335c..6e3b539b 100644
--- a/src/sos.spec
+++ b/src/sos.spec
@@ -2,18 +2,21 @@
%define name sos
%define version 1.6
-%define release 3
+%define release 4
Summary: Sos is a set of tools to gather troubleshooting information from a system
Name: %{name}
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
Source0: %{name}-%{version}.tar.gz
License: GPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
-Packager: Navid Sheikhol-Eslami <navid@redhat.com>
Url: http://sos.108.redhat.com/
BuildRequires: python-devel
@@ -48,6 +51,9 @@ rm -rf ${RPM_BUILD_ROOT}
%doc README TODO LICENSE
%changelog
+* Mon Jul 5 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-4
+- More fixes to make package Fedora compliant.
+
* Mon Jul 2 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-3
- Other fixes to make package Fedora compliant.