hwdata 0.236

diff --git a/Makefile b/Makefile
index c273e8e8187dc6c664e87542d71b44a8f139c91f..f661cd5f392c759fdbc8d4ca8b59d0481065bb9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,21 +55,21 @@ check:
        @echo -n "CHECK date of usb.ids: "; grep "Date:" usb.ids | cut -d ' ' -f 6
 
 create-archive:
-       @rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION)-$(RELEASE).tar*  2>/dev/null
+       @rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar*  2>/dev/null
        @make changelog
-       @git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION)-$(RELEASE).tar
+       @git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION).tar
        @mkdir $(NAME)-$(VERSION)
        @cp ChangeLog $(NAME)-$(VERSION)/
-       @tar --append -f $(NAME)-$(VERSION)-$(RELEASE).tar $(NAME)-$(VERSION)
-       @bzip2 -f $(NAME)-$(VERSION)-$(RELEASE).tar
+       @tar --append -f $(NAME)-$(VERSION).tar $(NAME)-$(VERSION)
+       @bzip2 -f $(NAME)-$(VERSION).tar
        @rm -rf $(NAME)-$(VERSION)
        @echo ""
-       @echo "The final archive is in $(NAME)-$(VERSION)-$(RELEASE).tar.bz2"
+       @echo "The final archive is in $(NAME)-$(VERSION).tar.bz2"
 
 archive: check clean commit tag create-archive
 
 upload:
-       @scp ${NAME}-$(VERSION)-$(RELEASE).tar.bz2 fedorahosted.org:$(NAME)
+       @scp ${NAME}-$(VERSION).tar.bz2 fedorahosted.org:$(NAME)
 
 dummy:
 

diff --git a/hwdata.spec b/hwdata.spec
index 1eef530eb54dba5ad5ac0a697b6536657668877f..b63e6518d788ce546b54d30e47a50fa2ccf211cf 100644 (file)
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,10 +1,10 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.235
+Version: 0.236
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-Source: hwdata-%{version}-%{release}.tar.bz2
+Source: https://fedorahosted.org/releases/h/w/%{name}-%{version}-%{release}.tar.bz2
 URL:    http://git.fedorahosted.org/git/hwdata.git
 BuildArch: noarch
 
@@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/*
 
 %changelog
+* Thu Aug 23 2012 Adam Jackson <ajax@redhat.com> 0.236-1
+- Fix reference specfile to current Fedora style
+
 * Thu Aug 23 2012 Adam Jackson <ajax@redhat.com> 0.235-1
 - Update data files
 - Remove upgradelist, not needed since kudzu-ectomy