define gittag for rpm target

diff --git a/Makefile b/Makefile
index f3216332b6b9dccc8b943993f3aac0e6d06b4e1c..c4f525ba68c91ac7276b937f173820c8f0880beb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ archive:
        git archive --format=tar HEAD --prefix=dracut-$(VERSION)-$(GITVERSION)/ |bzip2 > dracut-$(VERSION)-$(GITVERSION).tar.bz2
 
 rpm:
-       rpmbuild --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_builddir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" -ba dracut.spec 
+       rpmbuild --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_builddir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" --define "gittag $(GITVERSION)" -ba dracut.spec 
 
 testimage:
        ./dracut -l test.img $(uname -r)

diff --git a/dracut.spec b/dracut.spec
index d24a640b7244813f01c600190768959d1944a3fa..076bc2207e5173a45fe4e48cee6faf1b9f3f6361 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,13 +1,18 @@
-%define gittag f8a22bfb
+# define gittag f8a22bfb
 %define replace_mkinitrd 0
 Name: dracut
 Version: 0.0
+%if %{defined gittag}
 Release: 1.git%{gittag}%{?dist}
+%define dashgittag -%{gittag}
+%else
+Release: 1%{?dist}
+%endif
 Summary: Initramfs generator using udev
 Group: System Environment/Base         
 License: GPLv2 
 URL: http://fedoraproject.org/wiki/Initrdrewrite               
-Source0: dracut-%{version}-%{gittag}.tar.bz2
+Source0: dracut-%{version}%{?dashgittag}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
 Requires: lvm2
@@ -32,7 +37,7 @@ based around udev.
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{gittag}
+%setup -q -n %{name}-%{version}%{?dashgittag}
 
 %build
 make