different solution for the tarball naming

diff --git a/Makefile b/Makefile
index b5f868aabd4f0def04450ac1129bd8ba00f33627..0374c55ca1e25b4680d37990ed5d1e2ab53ea530 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 NAME=$(shell awk '/Name:/ { print $$2 }' hwdata.spec)
 VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
 RELEASE=$(shell awk '/Release:/ { a=$$2; sub("%.*","",a); print a }' hwdata.spec)
-RELVER=$(shell awk '/define relver/ { print $3 }' hwdata.spec)
 SOURCEDIR := $(shell pwd)
 
 prefix=$(DESTDIR)/usr
@@ -57,21 +56,21 @@ check:
        @[ `grep -vc '  ' videodrivers` -eq 0 ] || { echo "FAILURE: videodrivers not TAB separated"; exit 1; } && echo "OK: videodrivers"
 
 create-archive:
-       @rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION)-$(RELVER).tar*  2>/dev/null
+       @rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION)-$(RELEASE).tar*  2>/dev/null
        @make changelog
-       @git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION)-$(RELVER).tar
+       @git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION)-$(RELEASE).tar
        @mkdir $(NAME)-$(VERSION)
        @cp ChangeLog $(NAME)-$(VERSION)/
-       @tar --append -f $(NAME)-$(VERSION)-$(RELVER).tar $(NAME)-$(VERSION)
-       @bzip2 -f $(NAME)-$(VERSION)-$(RELVER).tar
+       @tar --append -f $(NAME)-$(VERSION)-$(RELEASE).tar $(NAME)-$(VERSION)
+       @bzip2 -f $(NAME)-$(VERSION)-$(RELEASE).tar
        @rm -rf $(NAME)-$(VERSION)
        @echo ""
-       @echo "The final archive is in $(NAME)-$(VERSION)-$(RELVER).tar.bz2"
+       @echo "The final archive is in $(NAME)-$(VERSION)-$(RELEASE).tar.bz2"
 
 archive: check clean commit tag create-archive
 
 upload:
-       @scp ${NAME}-$(VERSION)-$(RELVER).tar.bz2 fedorahosted.org:$(NAME)
+       @scp ${NAME}-$(VERSION)-$(RELEASE).tar.bz2 fedorahosted.org:$(NAME)
 
 dummy:
 

diff --git a/hwdata.spec b/hwdata.spec
index dce2b1587e869e3b41983d02c7fad2733ff909ed..e7b7aba536147f9cecf41c483bb1843cf6c66460 100644 (file)
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,11 +1,10 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
 Version: 0.233
-%define relver 5
-Release: %{relver}%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-Source: hwdata-%{version}-%{relver}.tar.bz2
+Source: hwdata-%{version}-%{release}.tar.bz2
 URL:    http://git.fedorahosted.org/git/hwdata.git
 BuildArch: noarch
 Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0
@@ -38,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/*
 
 %changelog
+* Fri Jan 28 2011 Karsten Hopp <karsten@redhat.com> 0.233-6
+- bump release
+
 * Fri Jan 28 2011 Karsten Hopp <karsten@redhat.com> 0.233-5
 - update oui.txt URL