[arduino] Update to 1.0.5.
mavit
mavit at fedoraproject.org
Thu May 23 16:52:22 UTC 2013
commit 4a1bbf2653f07a90abddefd3db2be9ba0ad628cd
Author: Peter Oliver <git at mavit.org.uk>
Date: Thu May 23 17:51:32 2013 +0100
Update to 1.0.5.
.gitignore | 1 +
arduino-add-to-groups.patch | 4 ++--
arduino-bug891556.patch | 11 -----------
arduino-script.patch | 6 +++---
arduino.spec | 17 +++++++++--------
sources | 2 +-
6 files changed, 16 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 44f0232..6039b02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/arduino-0022.tar.bz2
/arduino-1.0.tar.bz2
/arduino-1.0.1.tar.xz
+/arduino-1.0.5.tar.xz
diff --git a/arduino-add-to-groups.patch b/arduino-add-to-groups.patch
index cd6445f..c852214 100644
--- a/arduino-add-to-groups.patch
+++ b/arduino-add-to-groups.patch
@@ -75,6 +75,6 @@ index 7128bac..c45b678 100755
+ fi
+fi
+
- APPDIR="$(dirname -- $(readlink -f -- "${0}") )"
+ APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
- cd $APPDIR
+ cd "$APPDIR"
diff --git a/arduino-script.patch b/arduino-script.patch
index cda6dc5..fd711b3 100644
--- a/arduino-script.patch
+++ b/arduino-script.patch
@@ -19,10 +19,10 @@
fi
fi
--APPDIR="$(dirname -- $(readlink -f -- "${0}") )"
+-APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
+. /usr/share/java-utils/java-functions
--cd $APPDIR
+-cd "$APPDIR"
-
-for LIB in \
- java/lib/rt.jar \
@@ -45,6 +45,6 @@
-export PATH="${APPDIR}/java/bin:${PATH}"
+set_flags -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel
--java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base
+-java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base "$@"
+cd /usr/share/arduino
+run "$@"
diff --git a/arduino.spec b/arduino.spec
index f42259b..8c5b3e1 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,14 +1,14 @@
Name: arduino
Epoch: 1
-Version: 1.0.1
-Release: 4%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
Summary: An IDE for Arduino-compatible electronics prototyping platforms
Group: Development/Tools
License: GPLv2+ and LGPLv2+ and CC-BY-SA
URL: http://www.arduino.cc/
# There are lots of binaries in the "source" tarball. Remove them with:
-# curl -L http://arduino.googlecode.com/files/arduino-0022-src.tar.gz | tar -xzvf - && rm -r arduino-0022/build/linux/dist/tools/* && find arduino-0022 \( -type d \( -name macosx -o -name windows \) -o -type f \( -iname '*.jar' -or -iname '*.tgz' -or -iname '*.so' \) \) -print0 | xargs -0 rm -rf && tar -cJf arduino-0022.tar.bz2 arduino-0022
+# version=1.0.5; curl -L http://arduino.googlecode.com/files/arduino-$version-src.tar.gz | tar -xzf - && rm -r arduino-$version/build/linux/dist/tools/* && rm -r arduino-$version/hardware/arduino/firmwares/wifishield && find arduino-$version \( -type d \( -name macosx -o -name windows \) -o -type f \( -iname '*.jar' -or -iname '*.tgz' -or -iname '*.tar.gz' -or -iname '*.so' \) \) -print0 | xargs -0 rm -rf && tar -cJf arduino-$version.tar.xz arduino-$version
# See also http://code.google.com/p/arduino/issues/detail?id=193
Source0: %{name}-%{version}.tar.xz
@@ -26,10 +26,6 @@ Patch4: arduino-icons-etc.patch
Patch6: arduino-add-to-groups.patch
-# define __AVR_LIBC_DEPRECATED_ENABLE__ (bug 891556)
-# temporary; this has been fixed in newer upstreams
-Patch8: arduino-bug891556.patch
-
BuildRequires: java-devel >= 1:1.6.0 jpackage-utils ant ant-apache-regexp desktop-file-utils ecj jna rxtx git
Requires: %{name}-core = %{epoch}:%{version}-%{release}, %{name}-doc = %{epoch}:%{version}-%{release}
Requires: java >= 1:1.6.0 xorg-x11-fonts-Type1 ecj jna rxtx
@@ -86,7 +82,6 @@ chmod a+rx build/linux/%{name}-add-groups
%patch0
%patch3 -p1
%patch7 -p1
-%patch8 -p1
echo -e "\n# By default, don't notify the user of a new upstream version." \
"\n# https://bugzilla.redhat.com/show_bug.cgi?id=773519" \
@@ -201,6 +196,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu May 23 2013 Peter Oliver <rpm at mavit.org.uk> - 1:1.0.5-1
+- Update to 1.0.5.
+- Remove bug891556.patch.
+- Remove wifishield firmware for now, until I figure out whether it's
+ reasonable/permissible to include.
+
* Sat Feb 16 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1:1.0.1-4
- own /etc/arudino and /usr/share/arduino (bug 911931)
diff --git a/sources b/sources
index 365a3e4..1004872 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afa1ea59251fe7d62fd6862f978ddad0 arduino-1.0.1.tar.xz
+b14094dd4c64d55724aecc2cf38b729c arduino-1.0.5.tar.xz
More information about the scm-commits
mailing list