[arduino] Pass version number to "ant build" (fixes #815079).

mavit mavit at fedoraproject.org
Fri May 4 19:28:58 UTC 2012


commit b68cda0d80e64035b1d8930ff2e745580018878d
Author: Peter Oliver <git at mavit.org.uk>
Date:   Fri May 4 20:28:45 2012 +0100

    Pass version number to "ant build" (fixes #815079).

 arduino.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/arduino.spec b/arduino.spec
index ba79404..62ccca8 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,8 +1,7 @@
 Name:		arduino
 Epoch:		1
 Version:	1.0
-%define version_04d 0100
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	An IDE for Arduino-compatible electronics prototyping platforms
 Group:		Development/Tools
 License:	GPLv2+ and LGPLv2+ and CC-BY-SA
@@ -104,12 +103,12 @@ ant
 cd ..
 ant
 cd ../build
-ant dist < /dev/null
-tar -xf linux/%{name}-%{version_04d}-linux.tgz
+echo %{version} | ant dist
+tar -xf linux/%{name}-%{version}-linux.tgz
 
 
 %install
-cd build/%{name}-%{version_04d}
+cd build/%{name}-%{version}
 
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 cp -a arduino $RPM_BUILD_ROOT/%{_bindir}/
@@ -192,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May  4 2012 Peter Oliver <rpm at mavit.org.uk> - 1:1.0-4
+- Pass version number to "ant build" (fixes #815079).
+
 * Sat Jan 14 2012 Peter Oliver <rpm at mavit.org.uk> - 1:1.0-3
 - Change the default preferences so that we don't notify the user that a
   new upstream version has been released (#773519).


More information about the scm-commits mailing list