aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-04-18 18:42:03 +0000
committersconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-04-18 18:42:03 +0000
commit7cd05b634be1c5cb0d23f4e264871106dcd60c5c (patch)
treeed69f38e0cfa6ce9d7551511336705ef2045d1b2 /src
parent025c143437cb6d55eb9fdc61b005df48f41d2ace (diff)
downloadsos-7cd05b634be1c5cb0d23f4e264871106dcd60c5c.tar.gz
Cleaned up tagging and release in makefile, updated spec file
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@123 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src')
-rw-r--r--src/Makefile33
-rw-r--r--src/sos.spec15
2 files changed, 40 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile
index a480fd12..51efce99 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,23 +6,27 @@ NAME = sos
VERSION = $(shell awk '/Version/ { print $$2 }' sos.spec)
REPO = https://sos.108.redhat.com/svn/sos
SVNTAG = r$(subst .,-,$(VERSION))
+SVN_TAG_CONTENTS := $(shell svn list $(REPO)/tags/$(SVNTAG)/Makefile)
all:
-.PHONY: tag-archive create-archive archive install version clean
+.PHONY: tag-release tarball release install version clean
-../../tags/$(SVNTAG):
+tag-release:
+ifeq ($(strip $(SVN_TAG_CONTENTS)), Makefile)
+ @echo "The repository already contains a tag for version $(VERSION)"
+else
@svn copy $(REPO)/trunk/src $(REPO)/tags/$(SVNTAG) \
-m "Tagging the $(SVNTAG) release of the sos project"
@echo "$(SVNTAG)"
@svn update ../../tags
+endif
-tag-archive: ../../tags/$(SVNTAG)
-
-create-archive: tag-archive
+tarball: clean
+ @echo "Creating an archive from HEAD of development"
@rm -rf /tmp/$(NAME)
- @svn export $(REPO)/tags/$(SVNTAG) /tmp/$(NAME) \
+ @svn export -q $(REPO)/trunk/src /tmp/$(NAME) \
|| echo GRRRrrrrr -- ignore [export aborted]
@mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION)
@cd /tmp; tar --bzip2 -cSpf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
@@ -32,7 +36,22 @@ create-archive: tag-archive
@echo " "
@echo "The final archive is ./$(NAME)-$(VERSION).tar.bz2."
-archive: clean tag-archive create-archive
+release: clean tag-release
+ifeq ($(strip $(SVN_TAG_CONTENTS)), Makefile)
+ @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; 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
+ @echo " "
+ @echo "The final archive is ./$(NAME)-$(VERSION).tar.bz2."
+else
+ @echo "There is no tag in the repository for this version, must be tagged before release"
+endif
install:
python setup.py install
diff --git a/src/sos.spec b/src/sos.spec
index ced9138b..157e73ad 100644
--- a/src/sos.spec
+++ b/src/sos.spec
@@ -3,7 +3,7 @@
Summary: System Support Tools
Name: sos
Version: 1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,6 +47,19 @@ rm -rf $RPM_BUILD_ROOT
%doc README TODO
%changelog
+* Mon Apr 16 2007 Steve Conklin <sconklin at redhat dot com> - 1.3-3
+- including patches to fix the following:
+- bz_219745 sosreport needs a man page
+- bz_219667 sosreport does not terminate cleanly on ^C
+- bz_233375 Make SOS flag the situation when running on a fully virtu...
+- bz_234873 rhel5 sos needs to include rpm-va by default
+- bz_219669 sosreport multi-threaded option sometimes fails
+- bz_219671 RFE for sosreport - allow specification of plugins to be run
+- bz_219672 RFE - show progress while sosreport is running
+- bz_219673 Add xen information gathering to sosreport
+- bz_219675 Collect information related to the new driver update model
+- bz_219877 '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