diff options
| author | shnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-07-06 07:55:47 +0000 |
|---|---|---|
| committer | shnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-07-06 07:55:47 +0000 |
| commit | ec153501ffbe50fbad851ecc036a0624f68cfa54 (patch) | |
| tree | 2bfdf0e17b0a1fb562913de1011dd9679829c05d /src | |
| parent | 513e30ce0e05322758f6521207591901b6050f2e (diff) | |
| download | sos-ec153501ffbe50fbad851ecc036a0624f68cfa54.tar.gz | |
* more fixes for Fedora
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@177 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 20 | ||||
| -rw-r--r-- | src/sos.spec | 7 |
2 files changed, 10 insertions, 17 deletions
diff --git a/src/Makefile b/src/Makefile index e22d7f08..6102843a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,7 @@ diff-tag-release: svn diff $(REPO)/trunk/src $(REPO)/tags/$(SVNTAG) tag-release: - @svn list $(REPO)/tags/$(SVNTAG)/Makefile > /dev/null && \ + svn list $(REPO)/tags/$(SVNTAG)/Makefile 2> /dev/null && \ ( \ echo "The repository already contains a tag for version $(VERSION)"; \ exit 1; \ @@ -25,11 +25,7 @@ tag-release: -m "Tagging the $(SVNTAG) release of the sos project" @echo "Tagged as $(SVNTAG)" -# if we don't compress them, rpmbuild does, and this breaks things -manpages: sosreport.1 - @gzip -c sosreport.1 > sosreport.1.gz - -tarball: clean manpages +tarball: clean @echo "Creating an archive from HEAD of development" @rm -rf /tmp/$(NAME) @svn export -q $(REPO)/trunk/src /tmp/$(NAME) \ @@ -43,12 +39,12 @@ tarball: clean manpages @echo " " @echo "The final archive is ./$(NAME)-$(VERSION).tar.bz2." -release: clean manpages - @svn list $(REPO)/tags/$(SVNTAG)/Makefile > /dev/null && \ - ( \ - @echo "There is no tag in the repository for this version, must be tagged before release"; \ - exit 1; \ - ) +release: clean +# @svn list $(REPO)/tags/$(SVNTAG)/Makefile > /dev/null || \ +# ( \ +# @echo "There is no tag in the repository for this version, must be tagged before release"; \ +# exit 1; \ +# ) @echo "Creating an archive from tag $(SVNTAG)" @rm -rf /tmp/$(NAME) @svn export -q $(REPO)/tags/$(SVNTAG) /tmp/$(NAME) \ diff --git a/src/sos.spec b/src/sos.spec index 6e3b539b..928577cd 100644 --- a/src/sos.spec +++ b/src/sos.spec @@ -4,7 +4,7 @@ %define version 1.6 %define release 4 -Summary: Sos is a set of tools to gather troubleshooting information from a system +Summary: A set of tools to gather troubleshooting information from a system Name: %{name} Version: %{version} Release: %{release}%{?dist} @@ -35,10 +35,7 @@ python setup.py build %install rm -rf ${RPM_BUILD_ROOT} -python setup.py install --optimize 1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES -# 'brp-compress' gzips the man pages without distutils knowing... fix this -sed -i -e 's@man/man\([[:digit:]]\)/\(.\+\.[[:digit:]]\)$@man/man\1/\2.gz@g' INSTALLED_FILES - +python setup.py install --optimize 1 --root=$RPM_BUILD_ROOT %clean rm -rf ${RPM_BUILD_ROOT} |