The package rpms/arduino.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/arduino.git/commit/?id=78681f4751....
Change:
+ExclusiveArch: %{go_arches}
Thanks.
Full change:
============
commit e004e700d3a3686f8716a135606a9b7cf6a9f2c3
Author: Gianluca Sforna <giallu(a)gmail.com>
Date: Thu Aug 24 10:25:23 2017 +0200
fix Firmata url
diff --git a/arduino.spec b/arduino.spec
index ecae88b..3a87cd6 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -16,7 +16,7 @@ Source1:
http://downloads.arduino.cc/packages/package_index.json.gz
Source2:
http://downloads.arduino.cc/packages/package_index.json.sig
Source3:
http://downloads.arduino.cc/libraries/library_index.json.gz
-Source4:
https://github.com/arduino-libraries/Firmata/archive/v2.5.6.zip#/Firmata-...
+Source4:
https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip#/Firmata-2...
Source5:
https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip#/Bridge-1.6...
Source6:
https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip#/Rob...
Source7:
https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip#/Robot...
diff --git a/sources b/sources
index 8d036a2..dfc3afa 100644
--- a/sources
+++ b/sources
@@ -16,3 +16,4 @@ SHA512 (package_index.json.sig) =
95a0d4532a35c7c4530ecbc65269c3518da1cfda5f4638
SHA512 (package_index.json.gz) =
e8f2ea83192c88513a9b1bdbe170f728eececb9ad0560b9113803444f9e64b6f5369a09640b4553bca47fc0dabbf3723b7d71e81aa7a12d0284c42d79b75114b
SHA512 (WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip) =
f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9
SHA512 (library_index.json.gz) =
13be25d6d483edf272cac7fdcb6a8e791a9280c52a67114351fde02824589967d782bcf177fdc749eb97472dd7d0b0d3fdb15d012446a7d6048935d45838815d
+SHA512 (Firmata-2.5.6.zip) =
95ec24ebc6033d4c54ab47f306df8d6d9ab0a666ab0f0123edf8e48cbd66e8c78ccbbd4ff1a4acc0ab16f83dd04957727386ed6d8034284ceec70a0462894526
commit 11f4dcd394ebf57cf48571429b2e19d918db4b69
Author: Gianluca Sforna <giallu(a)gmail.com>
Date: Thu Aug 24 09:52:10 2017 +0200
update to 1.8.4
diff --git a/.gitignore b/.gitignore
index a49576d..8325f70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,9 @@
/Servo-1.1.2.zip
/Adafruit_CircuitPlayground-1.6.4.zip
/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip
+/arduino-1.8.4.tar.gz
+/LiquidCrystal-1.0.7.zip
+/Adafruit_CircuitPlayground-1.6.8.zip
+/Robot_Control-1.0.4.zip
+/Robot_Motor-1.0.3.zip
+/RobotIRremote-2.0.0.zip
diff --git a/arduino.spec b/arduino.spec
index d8b71a5..ecae88b 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,6 +1,6 @@
Name: arduino
Epoch: 1
-Version: 1.8.3
+Version: 1.8.4
Release: 1%{?dist}
Summary: An IDE for Arduino-compatible electronics prototyping platforms
Group: Development/Tools
@@ -18,9 +18,9 @@ Source3:
http://downloads.arduino.cc/libraries/library_index.json.gz
Source4:
https://github.com/arduino-libraries/Firmata/archive/v2.5.6.zip#/Firmata-...
Source5:
https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip#/Bridge-1.6...
-Source6:
https://github.com/arduino-libraries/Robot_Control/archive/1.0.3.zip#/Rob...
-Source7:
https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2.zip#/Robot...
-Source8:
https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2.zip#/Rob...
+Source6:
https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip#/Rob...
+Source7:
https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip#/Robot...
+Source8:
https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip#/Rob...
Source9:
https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip#/Spac...
Source10:
https://github.com/temboo/Temboo/archive/1.2.1.zip#/Temboo-1.2.1.zip
Source11:
https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip#/Esplora-1...
@@ -28,8 +28,9 @@ Source12:
https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip#/Mouse-
Source13:
https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip#/Keyboard...
Source14:
https://github.com/arduino-libraries/SD/archive/1.1.1.zip#/SD-1.1.1.zip
Source15:
https://github.com/arduino-libraries/Servo/archive/1.1.2.zip#/Servo-1.1.2...
-Source16:
https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.6.4.zip#...
-Source17:
https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/relea...
+Source16:
https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip#/Liq...
+Source17:
https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip#...
+Source18:
https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/relea...
BuildArch: noarch
@@ -131,7 +132,8 @@ cp -p %SOURCE13 ./build
cp -p %SOURCE14 ./build
cp -p %SOURCE15 ./build
cp -p %SOURCE16 ./build
-cp -p %SOURCE17 ./build/shared
+cp -p %SOURCE17 ./build
+cp -p %SOURCE18 ./build/shared
%patch0 -p1 -b .macosx
%patch2 -p1 -b .avrdude
@@ -294,6 +296,9 @@ fi
%{_datadir}/%{name}/arduino-builder
%changelog
+* Thu Aug 24 2017 Gianluca Sforna <giallu(a)gmail.com> - 1:1.8.4-1
+- update to 1.8.4
+
* Wed Aug 23 2017 Gianluca Sforna <giallu(a)gmail.com> - 1:1.8.3-1
- update to 1.8.3, based off Tom Callaway patches
diff --git a/sources b/sources
index a078f62..8d036a2 100644
--- a/sources
+++ b/sources
@@ -1,18 +1,18 @@
-SHA512 (arduino-1.8.3.tar.gz) =
68edd5f65d2983044ecf321d387c960f1df9069c567dd01e39cfcd20730523b4d5b203ff5a92d17a262158979e3edd79c56c3d182a76bbedf86f416ee35eb85f
-SHA512 (package_index.json.gz) =
e8f2ea83192c88513a9b1bdbe170f728eececb9ad0560b9113803444f9e64b6f5369a09640b4553bca47fc0dabbf3723b7d71e81aa7a12d0284c42d79b75114b
-SHA512 (package_index.json.sig) =
95a0d4532a35c7c4530ecbc65269c3518da1cfda5f4638c9fc8207b4c3e571aa84975192ed1bf994da25c743d18f58444c2b0d7c89431555586a3f1179f2ed23
-SHA512 (Firmata-2.5.6.zip) =
95ec24ebc6033d4c54ab47f306df8d6d9ab0a666ab0f0123edf8e48cbd66e8c78ccbbd4ff1a4acc0ab16f83dd04957727386ed6d8034284ceec70a0462894526
-SHA512 (Bridge-1.6.3.zip) =
6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5
-SHA512 (Robot_Control-1.0.3.zip) =
8998cc6661926677d1e28f671210ae6ed9b66124435a9ffd266286f1b71b44752be1c6564b7b6878fdd9fc0399e35355510f54028f1da44bea7bf7d33f409a42
-SHA512 (Robot_Motor-1.0.2.zip) =
e68490f7841c872a5fecb616724e461834c7285a8aa3f0bf55c23853e54de58abfcc717002b3a28321d029ba2d9f9bb9952eedf51742cc40fe2cf93eb6fc1422
-SHA512 (RobotIRremote-1.0.2.zip) =
c4b2738c7ec06816a57db6c7f7bd879f545502947d8c1ba0363d9fbca6f10af36f232952ce79fb4e15a46ef0a51a83f6d6bc37972d568113f8945e417637aece
-SHA512 (SpacebrewYun-1.0.1.zip) =
ec9f499db57d3f86e8615b1a56ae61781add99e9fe4c38ba9faa85d2f7d61090e345a63e8ba4a189c62650631ea5be5cbf22dfb39920a63873408a55c40ac133
+SHA512 (arduino-1.8.4.tar.gz) =
215f8c6e2f4387bc495f1d250aae55193a13a625fd3284691ca3035c10a0d87ae59ce104bb8ee6ef57dd6f37d6aad30197bb51e8201f78be80f2e2f14ed6a19b
SHA512 (Temboo-1.2.1.zip) =
4ce89b50cb93f85416b35dc218ad4d5fe0768032d146780d82f1d5d834a24dd831ecc4f1bcfa26d740643a3a7f297cdcec4d19bbf1216482d592d44dcbe2f27c
SHA512 (Esplora-1.0.4.zip) =
10665b20d907d586bbe22345799e989b835aaa188040b269ed2925a7b4990c6fb368f0e5afd6c4bed265f2baafc815839ff7c53b5da4940e5338090f39e9c13b
SHA512 (Mouse-1.0.1.zip) =
be0edd798cafa327752c2d2906193be81bcd214a0f406aca646c043ee527e1c398bde8636b35710b4d02074f01c398147fe2bab7108626d80b4181c0c40aa313
SHA512 (Keyboard-1.0.1.zip) =
583328acb8e771b59f3e5bed02892740bcd840baafe63f12850e2c43ae7d05ad31bcc19c5e591e73ab29165952d2a7669bbd07b234dd3abd4c38ea54baf22eec
SHA512 (SD-1.1.1.zip) =
b24c2ac276cb531043665b835a1d372294a34ddc2dda12c117b26e4ff33e31975b880e878b17d5798dc18f106091c3b60b6546a672267cf8937c4b0245a85342
SHA512 (Servo-1.1.2.zip) =
ade1d725c071e97dc027bc654a1c4b79d3cd6c75bf45bac9c3dfed394451b1661c2488217562515fbb8e29698c7df66e30f8178cea40c7f82056546aa857e348
-SHA512 (Adafruit_CircuitPlayground-1.6.4.zip) =
f2a45282f68a236d2db5fa38f49dc2f95ed08331773f2dc933406e1ebeb1bb3987e4245d156b3254592a4e291008a566d9e000888d699161989b09ca0aa9a7d3
+SHA512 (LiquidCrystal-1.0.7.zip) =
352cbffeaced5e52d1e2b8f118681ce435425bf87c0d1b6c384d11127f371ebcf4a026a0d0320fc324285f959d76b6a28cadba8e038e337d020beca847fcd985
+SHA512 (Adafruit_CircuitPlayground-1.6.8.zip) =
0f0d32841bb6987edfc0e9aa0af8d0f7cf68dd33bf07ff0ec4cdd0d9733bb092b97a4810d7a0828e1d38fb25ec58e8fd3c023f70dffa3b1397386a902c932491
+SHA512 (Bridge-1.6.3.zip) =
6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5
+SHA512 (Robot_Control-1.0.4.zip) =
45f710dfc8084f9fcf1608a67978f72885aff06e2bbbcb2613f4e337df8621b0f952383a71a55198618b145df378a94321bd5be83929be897fdd95b6bb69cfe0
+SHA512 (Robot_Motor-1.0.3.zip) =
92d108cc2ddb64e2580fab2cb3a157efb76c5204256332527c3fff67ebb8e520621cdc178738132d4e9ee9e2bcde99968b8f9d3c97c10f7d153792e57cfad111
+SHA512 (RobotIRremote-2.0.0.zip) =
ad38f813825137f60610d168d6352c871da6d8a39b4378764d82a997719c07c5c314816d8384e205599fc5da198465ed334a8794e7d477d55685eb8f7672acd4
+SHA512 (SpacebrewYun-1.0.1.zip) =
ec9f499db57d3f86e8615b1a56ae61781add99e9fe4c38ba9faa85d2f7d61090e345a63e8ba4a189c62650631ea5be5cbf22dfb39920a63873408a55c40ac133
+SHA512 (package_index.json.sig) =
95a0d4532a35c7c4530ecbc65269c3518da1cfda5f4638c9fc8207b4c3e571aa84975192ed1bf994da25c743d18f58444c2b0d7c89431555586a3f1179f2ed23
+SHA512 (package_index.json.gz) =
e8f2ea83192c88513a9b1bdbe170f728eececb9ad0560b9113803444f9e64b6f5369a09640b4553bca47fc0dabbf3723b7d71e81aa7a12d0284c42d79b75114b
SHA512 (WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip) =
f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9
SHA512 (library_index.json.gz) =
13be25d6d483edf272cac7fdcb6a8e791a9280c52a67114351fde02824589967d782bcf177fdc749eb97472dd7d0b0d3fdb15d012446a7d6048935d45838815d
commit 94ae96b3a9966a93840674bcd64d3f8feb07de3d
Author: Gianluca Sforna <giallu(a)gmail.com>
Date: Wed Aug 23 12:42:33 2017 +0200
forgot one source file
diff --git a/sources b/sources
index 1cc7993..a078f62 100644
--- a/sources
+++ b/sources
@@ -15,3 +15,4 @@ SHA512 (SD-1.1.1.zip) =
b24c2ac276cb531043665b835a1d372294a34ddc2dda12c117b26e4f
SHA512 (Servo-1.1.2.zip) =
ade1d725c071e97dc027bc654a1c4b79d3cd6c75bf45bac9c3dfed394451b1661c2488217562515fbb8e29698c7df66e30f8178cea40c7f82056546aa857e348
SHA512 (Adafruit_CircuitPlayground-1.6.4.zip) =
f2a45282f68a236d2db5fa38f49dc2f95ed08331773f2dc933406e1ebeb1bb3987e4245d156b3254592a4e291008a566d9e000888d699161989b09ca0aa9a7d3
SHA512 (WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip) =
f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9
+SHA512 (library_index.json.gz) =
13be25d6d483edf272cac7fdcb6a8e791a9280c52a67114351fde02824589967d782bcf177fdc749eb97472dd7d0b0d3fdb15d012446a7d6048935d45838815d
commit d88e10086d448660ca60468aa6a583bc52bd3cf8
Author: Gianluca Sforna <giallu(a)gmail.com>
Date: Wed Aug 23 12:23:12 2017 +0200
update to 1.8.3, based off Tom Callaway patches
diff --git a/.gitignore b/.gitignore
index 461f56c..a49576d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,15 @@
/Firmata-2.5.0.zip
/arduino-1.6.7.tar.gz
/Bridge-1.6.0.zip
+/arduino-1.8.3.tar.gz
+/Firmata-2.5.6.zip
+/Bridge-1.6.3.zip
+/Robot_Control-1.0.3.zip
+/SpacebrewYun-1.0.1.zip
+/Temboo-1.2.1.zip
+/Mouse-1.0.1.zip
+/Keyboard-1.0.1.zip
+/SD-1.1.1.zip
+/Servo-1.1.2.zip
+/Adafruit_CircuitPlayground-1.6.4.zip
+/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip
diff --git a/arduino-1.8.3-armbuild.patch b/arduino-1.8.3-armbuild.patch
new file mode 100644
index 0000000..ca74636
--- /dev/null
+++ b/arduino-1.8.3-armbuild.patch
@@ -0,0 +1,12 @@
+diff -up Arduino-1.8.3/build/build.xml.armbuild Arduino-1.8.3/build/build.xml
+--- Arduino-1.8.3/build/build.xml.armbuild 2017-08-14 15:43:57.260858042 -0400
++++ Arduino-1.8.3/build/build.xml 2017-08-14 15:44:50.829555330 -0400
+@@ -21,7 +21,7 @@
+ <condition property="platform" value="macosx"><os
family="mac" /></condition>
+ <condition property="platform" value="windows"><os
family="windows" /></condition>
+ <condition property="platform" value="linux32"><os
family="unix" arch="i386" /></condition>
+- <condition property="platform" value="linux64"><os
family="unix" arch="amd64" /></condition>
++ <condition property="platform" value="linux64"><os
family="unix" /></condition>
+ <condition property="platform" value="linuxarm"><os
family="unix" arch="arm" /></condition>
+
+ <condition property="windows_host" value="true"><os
family="windows" /></condition>
diff --git a/arduino-1.8.3-macosx.patch b/arduino-1.8.3-macosx.patch
new file mode 100644
index 0000000..d8a8444
--- /dev/null
+++ b/arduino-1.8.3-macosx.patch
@@ -0,0 +1,22 @@
+diff -up Arduino-1.8.3/app/src/processing/app/Base.java.macosx
Arduino-1.8.3/app/src/processing/app/Base.java
+--- Arduino-1.8.3/app/src/processing/app/Base.java.macosx 2017-05-31 11:03:10.000000000
-0400
++++ Arduino-1.8.3/app/src/processing/app/Base.java 2017-08-14 15:25:00.613226485 -0400
+@@ -49,7 +49,6 @@ import processing.app.helpers.filefilter
+ import processing.app.helpers.filefilters.OnlyFilesWithExtension;
+ import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
+ import processing.app.legacy.PApplet;
+-import processing.app.macosx.ThinkDifferent;
+ import processing.app.packages.LibraryList;
+ import processing.app.packages.UserLibrary;
+ import processing.app.syntax.PdeKeywords;
+@@ -132,10 +131,6 @@ public class Base {
+ }
+ System.setProperty("java.net.useSystemProxies", "true");
+
+- if (OSUtils.isMacOS()) {
+- ThinkDifferent.init();
+- }
+-
+ try {
+ INSTANCE = new Base(args);
+ } catch (Throwable e) {
diff --git a/arduino-1.8.3-script.patch b/arduino-1.8.3-script.patch
new file mode 100644
index 0000000..10f42b0
--- /dev/null
+++ b/arduino-1.8.3-script.patch
@@ -0,0 +1,65 @@
+diff -up Arduino-1.8.3/build/linux/dist/arduino.scripts
Arduino-1.8.3/build/linux/dist/arduino
+--- Arduino-1.8.3/build/linux/dist/arduino.scripts 2017-08-14 15:39:13.877749505 -0400
++++ Arduino-1.8.3/build/linux/dist/arduino 2017-08-14 15:43:26.949595168 -0400
+@@ -1,36 +1,38 @@
+ #!/usr/bin/env bash
+
+-APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
+-
+-for LIB in \
+- "$APPDIR"/java/lib/rt.jar \
+- "$APPDIR"/java/lib/tools.jar \
+- "$APPDIR"/lib/*.jar \
+- ;
+-do
+- CLASSPATH="${CLASSPATH}:${LIB}"
+-done
+-export CLASSPATH
++if [[ `id -u` -ne 0 ]]; then
++ for group in dialout lock; do
++ if ! groups $USER | grep -q " : .*\b$group\b"; then
++ missing_groups="$missing_groups\n$group"
++ fi
++ done
++ if [[ -n $missing_groups ]] && zenity --title=Arduino
--window-icon=/usr/share/icons/hicolor/16x16/apps/arduino.png --question --text "You
need to be a member of the following groups to upload code to an Arduino microcontroller
over the USB or serial ports:\n$missing_groups" --ok-label='Add'
--cancel-label='Ignore'; then
++ pkexec /usr/libexec/arduino-add-groups \
++ && zenity --title=Arduino
--window-icon=/usr/share/icons/hicolor/16x16/apps/arduino.png --info --text "You must
log out and log in again before any changes will take effect."
++ fi
++fi
+
+-LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+-export LD_LIBRARY_PATH
++. /usr/share/java-utils/java-functions
+
+-export PATH="${APPDIR}/java/bin:${PATH}"
++MAIN_CLASS=processing.app.Base
+
+-export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed
's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
++set_classpath apache-commons-codec apache-commons-compress apache-commons-exec \
++apache-commons-lang3 apache-commons-logging apache-commons-net bcpg bcprov \
++jackson-core jackson-databind jackson-modules-base jmdns jsch jsemver jssc \
++guava objectweb-asm jackson-annotations \
++jakarta-commons-httpclient rsyntaxtextarea batik xml-commons-apis-ext
xmlgraphics-commons
+
+-JAVA=java
+-if [ -x "$APPDIR/java/bin/java" ]; then
+- JAVA=$APPDIR/java/bin/java
+-fi
++for lib in /usr/share/arduino/*.jar; do
++ CLASSPATH="$CLASSPATH:$lib"
++done
+
+-# Collect options to java in an array, to properly handle whitespace in options
+-JAVA_OPTIONS=("-DAPP_DIR=$APPDIR"
"-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel")
++set_flags -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH
+
+ # Only show the splash screen when no options are present
+ if [[ "$@" != *"--"* ]] ; then
+- JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png")
++ SPLASH=("-splash:/usr/share/arduino/lib/splash.png")
+ fi
+
+-"$JAVA" "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
++cd /usr/share/arduino
+
++run "$@"
diff --git a/arduino-1.8.3-use-system-astyle.patch
b/arduino-1.8.3-use-system-astyle.patch
new file mode 100644
index 0000000..74f80b7
--- /dev/null
+++ b/arduino-1.8.3-use-system-astyle.patch
@@ -0,0 +1,53 @@
+diff -up
Arduino-1.8.3/app/src/cc/arduino/packages/formatter/AStyleInterface.java.system-astyle
Arduino-1.8.3/app/src/cc/arduino/packages/formatter/AStyleInterface.java
+---
Arduino-1.8.3/app/src/cc/arduino/packages/formatter/AStyleInterface.java.system-astyle 2017-05-31
11:03:10.000000000 -0400
++++ Arduino-1.8.3/app/src/cc/arduino/packages/formatter/AStyleInterface.java 2017-08-14
16:03:31.638298899 -0400
+@@ -41,7 +41,11 @@ public class AStyleInterface {
+ loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
+ loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
+ }
+- loadLib(new File(Base.getContentFile("lib"),
System.mapLibraryName("astylej")));
++ File astyleLib = new File("/usr/lib64/libastyle.so.3");
++ if (! astyleLib.exists()) {
++ astyleLib = new File("/usr/lib/libastyle.so.3");
++ }
++ loadLib(astyleLib);
+ }
+
+ private static void loadLib(File lib) {
+diff -up Arduino-1.8.3/build/build.xml.system-astyle Arduino-1.8.3/build/build.xml
+--- Arduino-1.8.3/build/build.xml.system-astyle 2017-08-14 16:16:51.094005289 -0400
++++ Arduino-1.8.3/build/build.xml 2017-08-14 16:17:52.870525170 -0400
+@@ -641,14 +641,14 @@
+ </target>
+
+ <target name="linux-libastyle-x86" depends="linux-build"
description="Download libastyle.so for x86/x64 arch">
+- <antcall target="unzip">
++ <!--antcall target="unzip">
+ <param name="archive_file"
value="./libastylej-2.05.1-3.zip" />
+ <param name="archive_url"
value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+ <param name="final_folder"
value="${staging_folder}/libastylej-2.05.1" />
+ <param name="dest_folder" value="${staging_folder}" />
+ </antcall>
+ <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so"
tofile="linux/work/lib/libastylej.so" />
+- <chmod perm="755" file="linux/work/lib/libastylej.so" />
++ <chmod perm="755" file="linux/work/lib/libastylej.so"
/-->
+
+ <antcall target="portable-${portable}">
+ <param name="parentdir" value="linux/work" />
+@@ -666,14 +666,14 @@
+ </target>
+
+ <target name="linux-libastyle-arm" depends="linux-build"
description="Download libastyle.so for ARM">
+- <antcall target="unzip">
++ <!--antcall target="unzip">
+ <param name="archive_file"
value="./libastylej-2.05.1-3.zip" />
+ <param name="archive_url"
value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+ <param name="final_folder"
value="${staging_folder}/libastylej-2.05.1" />
+ <param name="dest_folder" value="${staging_folder}" />
+ </antcall>
+ <copy file="linux/libastylej-2.05.1/libastylej_arm.so"
tofile="linux/work/lib/libastylej.so" />
+- <chmod perm="755" file="linux/work/lib/libastylej.so" />
++ <chmod perm="755" file="linux/work/lib/libastylej.so"
/-->
+
+ <antcall target="portable-${portable}">
+ <param name="parentdir" value="linux/work" />
diff --git a/arduino-1.8.3-use-system-avrdude.patch
b/arduino-1.8.3-use-system-avrdude.patch
new file mode 100644
index 0000000..a900b94
--- /dev/null
+++ b/arduino-1.8.3-use-system-avrdude.patch
@@ -0,0 +1,24 @@
+diff -up Arduino-1.8.3/hardware/arduino/avr/platform.txt.avrdude
Arduino-1.8.3/hardware/arduino/avr/platform.txt
+--- Arduino-1.8.3/hardware/arduino/avr/platform.txt.avrdude 2017-08-14 15:37:03.194927521
-0400
++++ Arduino-1.8.3/hardware/arduino/avr/platform.txt 2017-08-14 15:38:31.878770859 -0400
+@@ -18,6 +18,7 @@ compiler.warning_flags.more=-Wall
+ compiler.warning_flags.all=-Wall -Wextra
+
+ # Default "compiler.path" is correct, change only if you want to override the
initial value
++runtime.tools.avr-gcc.path=/usr
+ compiler.path={runtime.tools.avr-gcc.path}/bin/
+ compiler.c.cmd=avr-gcc
+ compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections
-fdata-sections -MMD -flto -fno-fat-lto-objects
+@@ -91,9 +92,9 @@ recipe.preproc.macros="{compiler.path}{c
+ # AVR Uploader/Programmers tools
+ # ------------------------------
+
+-tools.avrdude.path={runtime.tools.avrdude.path}
+-tools.avrdude.cmd.path={path}/bin/avrdude
+-tools.avrdude.config.path={path}/etc/avrdude.conf
++tools.avrdude.path=/
++tools.avrdude.cmd.path={path}usr/bin/avrdude
++tools.avrdude.config.path={path}etc/avrdude/avrdude.conf
+
+ tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
+
diff --git a/arduino-1.8.3-use-system-libserialport.patch
b/arduino-1.8.3-use-system-libserialport.patch
new file mode 100644
index 0000000..f57a975
--- /dev/null
+++ b/arduino-1.8.3-use-system-libserialport.patch
@@ -0,0 +1,37 @@
+diff -up Arduino-1.8.3/build/build.xml.system-libserialport
Arduino-1.8.3/build/build.xml
+--- Arduino-1.8.3/build/build.xml.system-libserialport 2017-08-14 16:23:50.148965051
-0400
++++ Arduino-1.8.3/build/build.xml 2017-08-14 16:25:07.124120786 -0400
+@@ -654,14 +654,14 @@
+ <param name="parentdir" value="linux/work" />
+ </antcall>
+
+- <antcall target="unzip">
++ <!--antcall target="unzip">
+ <param name="archive_file"
value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
+ <param name="archive_url"
value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip"
/>
+ <param name="final_folder"
value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
+ <param name="dest_folder" value="${staging_folder}" />
+ </antcall>
+ <copy
file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/linux${arch-bits}/liblistSerialsj.so"
todir="linux/work/lib/" />
+- <chmod perm="755" file="linux/work/lib/liblistSerialsj.so"
/>
++ <chmod perm="755" file="linux/work/lib/liblistSerialsj.so"
/-->
+
+ </target>
+
+@@ -679,14 +679,14 @@
+ <param name="parentdir" value="linux/work" />
+ </antcall>
+
+- <antcall target="unzip">
++ <!--antcall target="unzip">
+ <param name="archive_file"
value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
+ <param name="archive_url"
value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip"
/>
+ <param name="final_folder"
value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
+ <param name="dest_folder" value="${staging_folder}" />
+ </antcall>
+ <copy
file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/arm/liblistSerialsj.so"
todir="linux/work/lib/" />
+- <chmod perm="755" file="linux/work/lib/liblistSerialsj.so"
/>
++ <chmod perm="755" file="linux/work/lib/liblistSerialsj.so"
/-->
+
+ </target>
+
diff --git a/arduino-armbuild.patch b/arduino-armbuild.patch
deleted file mode 100644
index 4a98f6c..0000000
--- a/arduino-armbuild.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/build.xml b/build/build.xml
-index 0cece65..6880399 100644
---- a/build/build.xml
-+++ b/build/build.xml
-@@ -21,7 +21,7 @@
- <condition property="platform" value="macosx"><os
family="mac" /></condition>
- <condition property="platform" value="windows"><os
family="windows" /></condition>
- <condition property="platform" value="linux32"><os
family="unix" arch="i386" /></condition>
-- <condition property="platform" value="linux64"><os
family="unix" arch="amd64" /></condition>
-+ <condition property="platform" value="linux64"><os
family="unix" /></condition>
-
- <condition property="macosx"><equals arg1="${platform}"
arg2="macosx" /></condition>
- <condition property="windows"><equals arg1="${platform}"
arg2="windows" /></condition>
diff --git a/arduino-macosx.patch b/arduino-macosx.patch
deleted file mode 100644
index 3e7458a..0000000
--- a/arduino-macosx.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
-index 3990aa0..9685086 100644
---- a/app/src/processing/app/Base.java
-+++ b/app/src/processing/app/Base.java
-@@ -46,7 +46,6 @@ import processing.app.helpers.filefilters.OnlyDirs;
- import processing.app.helpers.filefilters.OnlyFilesWithExtension;
- import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
- import processing.app.legacy.PApplet;
--import processing.app.macosx.ThinkDifferent;
- import processing.app.packages.LibraryList;
- import processing.app.packages.UserLibrary;
- import processing.app.syntax.PdeKeywords;
-@@ -127,10 +126,6 @@ public class Base {
-
- splashScreenHelper.splashText(tr("Loading configuration..."));
-
-- if (OSUtils.isMacOS()) {
-- ThinkDifferent.init();
-- }
--
- try {
- guardedMain(args);
- } catch (Throwable e) {
diff --git a/arduino-script.patch b/arduino-script.patch
deleted file mode 100644
index ac5f368..0000000
--- a/arduino-script.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
-index d4e7f19..80b9d3c 100755
---- a/build/linux/dist/arduino
-+++ b/build/linux/dist/arduino
-@@ -1,35 +1,37 @@
- #!/usr/bin/env bash
-
--APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
--
--for LIB in \
-- "$APPDIR"/java/lib/rt.jar \
-- "$APPDIR"/java/lib/tools.jar \
-- "$APPDIR"/lib/*.jar \
-- ;
--do
-- CLASSPATH="${CLASSPATH}:${LIB}"
--done
--export CLASSPATH
-+if [[ `id -u` -ne 0 ]]; then
-+ for group in dialout lock; do
-+ if ! groups $USER | grep -q " : .*\b$group\b"; then
-+ missing_groups="$missing_groups\n$group"
-+ fi
-+ done
-+ if [[ -n $missing_groups ]] && zenity --title=Arduino
--window-icon=/usr/share/icons/hicolor/16x16/apps/arduino.png --question --text "You
need to be a member of the following groups to upload code to an Arduino microcontroller
over the USB or serial ports:\n$missing_groups" --ok-label='Add'
--cancel-label='Ignore'; then
-+ pkexec /usr/libexec/arduino-add-groups \
-+ && zenity --title=Arduino
--window-icon=/usr/share/icons/hicolor/16x16/apps/arduino.png --info --text "You must
log out and log in again before any changes will take effect."
-+ fi
-+fi
-
--LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
--export LD_LIBRARY_PATH
-+. /usr/share/java-utils/java-functions
-
--export PATH="${APPDIR}/java/bin:${PATH}"
-+MAIN_CLASS=processing.app.Base
-
--export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed
's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
-+set_classpath apache-commons-codec apache-commons-compress apache-commons-exec \
-+apache-commons-lang3 apache-commons-logging apache-commons-net bcpg bcprov \
-+jackson-core jackson-databind jackson-modules-base jmdns jsch jsemver jssc \
-+guava objectweb-asm jackson-annotations \
-+jakarta-commons-httpclient rsyntaxtextarea
-
--JAVA=java
--if [ -x "$APPDIR/java/bin/java" ]; then
-- JAVA=$APPDIR/java/bin/java
--fi
-+for lib in /usr/share/arduino/*.jar; do
-+ CLASSPATH="$CLASSPATH:$lib"
-+done
-
--# Collect options to java in an array, to properly handle whitespace in options
--JAVA_OPTIONS=("-DAPP_DIR=$APPDIR"
"-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel")
-+set_flags -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH
-
- if [[ "$@" != *"--upload"* && "$@" !=
*"--verify"* && "$@" != *"--get-pref"* &&
"$@" != *"--install-board"* && "$@" !=
*"--install-library"* ]] ; then
-- JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png")
-+ SPLASH="-splash:/usr/share/arduino/lib/splash.png"
- fi
-
--"$JAVA" "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
-+cd /usr/share/arduino
-
-+run "$@"
diff --git a/arduino-use-system-astyle.patch b/arduino-use-system-astyle.patch
deleted file mode 100644
index 8836cdf..0000000
--- a/arduino-use-system-astyle.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/app/src/cc/arduino/packages/formatter/AStyleInterface.java
b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
-index 4224bf1..96ffbda 100644
---- a/app/src/cc/arduino/packages/formatter/AStyleInterface.java
-+++ b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
-@@ -41,7 +41,11 @@ public class AStyleInterface {
- loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
- loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
- }
-- loadLib(new File(Base.getContentFile("lib"),
System.mapLibraryName("astylej")));
-+ File astyleLib = new File("/usr/lib64/libastyle.so.3");
-+ if (! astyleLib.exists()) {
-+ astyleLib = new File("/usr/lib/libastyle.so.3");
-+ }
-+ loadLib(astyleLib);
- }
-
- private static void loadLib(File lib) {
diff --git a/arduino-use-system-avrdude.patch b/arduino-use-system-avrdude.patch
deleted file mode 100644
index 05d8794..0000000
--- a/arduino-use-system-avrdude.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
-index 494efee..1a7fd63 100644
---- a/hardware/arduino/avr/platform.txt
-+++ b/hardware/arduino/avr/platform.txt
-@@ -18,6 +18,7 @@ compiler.warning_flags.more=-Wall
- compiler.warning_flags.all=-Wall -Wextra
-
- # Default "compiler.path" is correct, change only if you want to overidde the
initial value
-+runtime.tools.avr-gcc.path=/usr
- compiler.path={runtime.tools.avr-gcc.path}/bin/
- compiler.c.cmd=avr-gcc
- compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections
-fdata-sections -MMD
-@@ -91,9 +92,9 @@ recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}"
{compiler.cpp.flags} {
- # AVR Uploader/Programmers tools
- # ------------------------------
-
--tools.avrdude.path={runtime.tools.avrdude.path}
--tools.avrdude.cmd.path={path}/bin/avrdude
--tools.avrdude.config.path={path}/etc/avrdude.conf
-+tools.avrdude.path=/
-+tools.avrdude.cmd.path={path}usr/bin/avrdude
-+tools.avrdude.config.path={path}etc/avrdude/avrdude.conf
-
- tools.avrdude.upload.params.verbose=-v
- tools.avrdude.upload.params.quiet=-q -q
diff --git a/arduino.spec b/arduino.spec
index 7a5c9ce..d8b71a5 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,7 +1,7 @@
Name: arduino
Epoch: 1
-Version: 1.6.7
-Release: 3%{?dist}
+Version: 1.8.3
+Release: 1%{?dist}
Summary: An IDE for Arduino-compatible electronics prototyping platforms
Group: Development/Tools
License: GPLv2+ and LGPLv2+ and CC-BY-SA
@@ -16,16 +16,20 @@ Source1:
http://downloads.arduino.cc/packages/package_index.json.gz
Source2:
http://downloads.arduino.cc/packages/package_index.json.sig
Source3:
http://downloads.arduino.cc/libraries/library_index.json.gz
-Source4:
https://github.com/arduino-libraries/Firmata/archive/v2.5.0.zip#/Firmata-...
-Source5:
https://github.com/arduino-libraries/Bridge/archive/1.6.0.zip#/Bridge-1.6...
-Source6:
https://github.com/arduino-libraries/Robot_Control/archive/1.0.2.zip#/Rob...
+Source4:
https://github.com/arduino-libraries/Firmata/archive/v2.5.6.zip#/Firmata-...
+Source5:
https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip#/Bridge-1.6...
+Source6:
https://github.com/arduino-libraries/Robot_Control/archive/1.0.3.zip#/Rob...
Source7:
https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2.zip#/Robot...
Source8:
https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2.zip#/Rob...
-Source9:
https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.0.zip#/Spac...
-Source10:
https://github.com/temboo/Temboo/archive/1.1.4.zip#/Temboo-1.1.4.zip
+Source9:
https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip#/Spac...
+Source10:
https://github.com/temboo/Temboo/archive/1.2.1.zip#/Temboo-1.2.1.zip
Source11:
https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip#/Esplora-1...
-Source12:
https://github.com/arduino-libraries/Mouse/archive/1.0.0.zip#/Mouse-1.0.0...
-Source13:
https://github.com/arduino-libraries/Keyboard/archive/1.0.0.zip#/Keyboard...
+Source12:
https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip#/Mouse-1.0.1...
+Source13:
https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip#/Keyboard...
+Source14:
https://github.com/arduino-libraries/SD/archive/1.1.1.zip#/SD-1.1.1.zip
+Source15:
https://github.com/arduino-libraries/Servo/archive/1.1.2.zip#/Servo-1.1.2...
+Source16:
https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.6.4.zip#...
+Source17:
https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/relea...
BuildArch: noarch
@@ -36,33 +40,33 @@ BuildRequires: apache-commons-compress apache-commons-exec
apache-commons-lang3
BuildRequires: apache-commons-logging jsch guava jackson-annotations jssc
BuildRequires: bouncycastle-pg jackson-databind jackson-module-mrbean
BuildRequires: jakarta-commons-httpclient objectweb-asm
-BuildRequires: rsyntaxtextarea
+BuildRequires: rsyntaxtextarea batik xml-commons-apis xmlgraphics-commons
Requires: java >= 1:1.8.0
Requires: xorg-x11-fonts-Type1 ecj jna zenity perl-interpreter polkit ecj jna
Requires: jmdns jsemver apache-commons-net apache-commons-codec git
Requires: apache-commons-compress apache-commons-exec apache-commons-lang3
Requires: apache-commons-logging jsch guava jackson-annotations jssc
Requires: bouncycastle-pg jackson-databind jackson-module-mrbean
-Requires: jakarta-commons-httpclient objectweb-asm astyle
-Requires: rsyntaxtextarea
+Requires: jakarta-commons-httpclient objectweb-asm astyle libserialport
+Requires: rsyntaxtextarea batik xml-commons-apis xmlgraphics-commons
Requires: %{name}-core = %{epoch}:%{version}-%{release}
# require arduino-builder, which is a go project and won't exist outside these
arches
ExclusiveArch: %{go_arches}
-Requires: arduino-builder
+Requires: arduino-builder, arduino-listSerialPortsC
# This patch skips the init process for OSX platforms.
-Patch0: arduino-macosx.patch
-# Turns off all network downloads in build
-Patch1: arduino-no-network.patch
+Patch0: arduino-1.8.3-macosx.patch
# Redirects Arduino to system avr-gcc and avrdude utilities
-Patch2: arduino-use-system-avrdude.patch
+Patch2: arduino-1.8.3-use-system-avrdude.patch
Patch3: arduino-add-to-groups.patch
-Patch4: arduino-script.patch
+Patch4: arduino-1.8.3-script.patch
# Redirects Arduino to system astyle libraries
-Patch5: arduino-use-system-astyle.patch
+Patch5: arduino-1.8.3-use-system-astyle.patch
# Allows Arduino to build on non-intel systems
-Patch6: arduino-armbuild.patch
+Patch6: arduino-1.8.3-armbuild.patch
+# Do not download listSerialPortsC bits (they are in arduino-listSerialPortsC)
+Patch7: arduino-1.8.3-use-system-libserialport.patch
%description
Arduino is an open-source electronics prototyping platform based on
@@ -124,14 +128,18 @@ cp -p %SOURCE10 ./build
cp -p %SOURCE11 ./build
cp -p %SOURCE12 ./build
cp -p %SOURCE13 ./build
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+cp -p %SOURCE14 ./build
+cp -p %SOURCE15 ./build
+cp -p %SOURCE16 ./build
+cp -p %SOURCE17 ./build/shared
+
+%patch0 -p1 -b .macosx
+%patch2 -p1 -b .avrdude
+%patch3 -p1 -b .groups
+%patch4 -p1 -b .scripts
+%patch5 -p1 -b .system-astyle
+%patch6 -p1 -b .armbuild
+%patch7 -p1 -b .system-libserialport
# As mentioned earlier, binary forms are removed here.
find -type d \( -name macosx -o -name windows \) -print0 | xargs -0 rm -rf
@@ -149,18 +157,20 @@ build-jar-repository -p -s arduino-core/lib/ apache-commons-codec \
apache-commons-compress apache-commons-exec apache-commons-lang3 \
apache-commons-logging apache-commons-net bcpg bcprov jackson-core \
jackson-databind jackson-modules-base jmdns jsch jsemver jssc guava \
-objectweb-asm jackson-annotations rsyntaxtextarea
+objectweb-asm jackson-annotations rsyntaxtextarea batik xml-commons-apis-ext
xmlgraphics-commons
build-jar-repository -p -s app/lib/ guava apache-commons-logging \
jakarta-commons-httpclient jsch apache-commons-lang3 jssc jsemver \
-apache-commons-compress apache-commons-codec rsyntaxtextarea
+apache-commons-compress apache-commons-codec rsyntaxtextarea batik xml-commons-apis-ext
xmlgraphics-commons
touch app/test/cc/arduino/packages/contributions/library_index.json
%build
+%global antflags -Dno_docs=true -Dno_arduino_builder=true -Dsystem_avr=true
-Dlight_bundle=true
+
pushd build
-ant -verbose
-echo %{version} | ant dist
+ant -verbose %{antflags}
+echo %{version} | ant dist %{antflags}
mv linux/%{name}*.tar.xz linux/%{name}-%{version}.tar.xz
tar -xf linux/%{name}-%{version}.tar.xz
popd
@@ -172,7 +182,12 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -a arduino $RPM_BUILD_ROOT%{_bindir}/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -a dist hardware lib libraries examples $RPM_BUILD_ROOT/%{_datadir}/%{name}/
+cp -a hardware lib examples $RPM_BUILD_ROOT/%{_datadir}/%{name}/
+mkdir $RPM_BUILD_ROOT/%{_datadir}/%{name}/dist
+cp -a ../../*.json* $RPM_BUILD_ROOT/%{_datadir}/%{name}/dist/
+cp -a ../../libraries $RPM_BUILD_ROOT/%{_datadir}/%{name}/
+cp -a ../../hardware/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/hardware/
+
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/*.jar
rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/hardware/tools
@@ -222,10 +237,6 @@ cp -a ../linux/dist/cc.arduino.add-groups.policy
$RPM_BUILD_ROOT%{_datadir}/polk
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
cp -a ../linux/dist/appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
-# Remove stray Firmata files (v2.5.0)
-rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/libraries/Firmata-2.5.0
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/libraries/Firmata/.gitignore
-
# TODO
#%check
#pushd build
@@ -283,6 +294,9 @@ fi
%{_datadir}/%{name}/arduino-builder
%changelog
+* Wed Aug 23 2017 Gianluca Sforna <giallu(a)gmail.com> - 1:1.8.3-1
+- update to 1.8.3, based off Tom Callaway patches
+
* Wed Jul 26 2017 Gianluca Sforna <giallu(a)gmail.com> - 1:1.6.7-2
- re-uploaded all sources
diff --git a/sources b/sources
index 24b7f05..1cc7993 100644
--- a/sources
+++ b/sources
@@ -1,14 +1,17 @@
-SHA512 (arduino-1.6.7.tar.gz) =
2f76aedad6f8bb9c3e17c4b02ecf816f5fe628b4856a6bd9a3d7c0fe3d9999a39df60a4794d99b1e62c3ae41695350f27d148a0925f7f59b8071359d33be2b00
-SHA512 (Bridge-1.6.0.zip) =
a79829ac80566464758cc7e6d9deb8d3ea8cc4a3747a45a14f35819d9c2e9f2826f89c71cc4ce1788fd5f15f5340c191d8bdee6f71f8fa56552465b0ecb48eaa
-SHA512 (Esplora-1.0.4.zip) =
10665b20d907d586bbe22345799e989b835aaa188040b269ed2925a7b4990c6fb368f0e5afd6c4bed265f2baafc815839ff7c53b5da4940e5338090f39e9c13b
-SHA512 (Firmata-2.5.0.zip) =
1ef844c2aceea3f218b0bfb857e2064af1f4ec4dacc86036f379b4490725c8e4ef709af3c5d102d7e5f142e3eacde394f88ede6149cf35674f78d9363e4a1def
-SHA512 (Keyboard-1.0.0.zip) =
3128e78da7cc708bb6a9c0415f0dc14127d0710cb510aa2936512e023b06ea1cd2b1df87e33320f6af5a4f009759e6fb45bad17c7326881bff2276affd40cb98
-SHA512 (library_index.json.gz) =
640aeba99a7179af8b3fc7201b25046652c00e5b9b041cb00c1657b0a49e3831f0674beb1f1cf3f0e2a0ff6465848a5ffd67d8484a1cc2993a654ebae42c9912
-SHA512 (Mouse-1.0.0.zip) =
0e25af498834c238e52a91ba32e0325d76adb89922d3702d2ab6ffa640882cebdbb50e4787c32346a46da3c85a1b3cf1bf5cc3583204e93ffaf85b9a23fd70ff
-SHA512 (package_index.json.gz) =
117c8caaeeae4ddc5bab86fc3065360c93b493df3469cceb1e771a6834a52a2092fdb64d6953c688d3946cdce590570718e4210a9ea1963cd6a0d84ff5b0cc0d
-SHA512 (package_index.json.sig) =
59f19be66064de4d0b33904b3a44f525abf1cc254f481e14902d2384352a88b7c2aa5d9ce5235a97f059f719b7ed657038b4fc440a29ff0d5877a8b29f8a741a
-SHA512 (Robot_Control-1.0.2.zip) =
ce0d8c481d06c7fb2c5d61dabd6e4343fc0cccd07cf758b527ca29bf7204db83fb84dac972288c7d8ac3d4a5ec15b780bf89728f1c3e50b87109053b64339eb9
-SHA512 (RobotIRremote-1.0.2.zip) =
c4b2738c7ec06816a57db6c7f7bd879f545502947d8c1ba0363d9fbca6f10af36f232952ce79fb4e15a46ef0a51a83f6d6bc37972d568113f8945e417637aece
+SHA512 (arduino-1.8.3.tar.gz) =
68edd5f65d2983044ecf321d387c960f1df9069c567dd01e39cfcd20730523b4d5b203ff5a92d17a262158979e3edd79c56c3d182a76bbedf86f416ee35eb85f
+SHA512 (package_index.json.gz) =
e8f2ea83192c88513a9b1bdbe170f728eececb9ad0560b9113803444f9e64b6f5369a09640b4553bca47fc0dabbf3723b7d71e81aa7a12d0284c42d79b75114b
+SHA512 (package_index.json.sig) =
95a0d4532a35c7c4530ecbc65269c3518da1cfda5f4638c9fc8207b4c3e571aa84975192ed1bf994da25c743d18f58444c2b0d7c89431555586a3f1179f2ed23
+SHA512 (Firmata-2.5.6.zip) =
95ec24ebc6033d4c54ab47f306df8d6d9ab0a666ab0f0123edf8e48cbd66e8c78ccbbd4ff1a4acc0ab16f83dd04957727386ed6d8034284ceec70a0462894526
+SHA512 (Bridge-1.6.3.zip) =
6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5
+SHA512 (Robot_Control-1.0.3.zip) =
8998cc6661926677d1e28f671210ae6ed9b66124435a9ffd266286f1b71b44752be1c6564b7b6878fdd9fc0399e35355510f54028f1da44bea7bf7d33f409a42
SHA512 (Robot_Motor-1.0.2.zip) =
e68490f7841c872a5fecb616724e461834c7285a8aa3f0bf55c23853e54de58abfcc717002b3a28321d029ba2d9f9bb9952eedf51742cc40fe2cf93eb6fc1422
-SHA512 (SpacebrewYun-1.0.0.zip) =
bfde6e2ab64ffbf4dfcb26c8a85fa807f9201e350a044d483dfc7f0b4249a7f38eb08fbcf2a10015c38eeffe328990a958b64bc20ea911f0481f5a1a30d1038d
-SHA512 (Temboo-1.1.4.zip) =
59d1b4027f436c6526189a972379f2c91d533ef249edea1843c022e4bb33bee6811d2ec9278a507e9cbdfa252685610f62043853c23c7e42831752945a1b677e
+SHA512 (RobotIRremote-1.0.2.zip) =
c4b2738c7ec06816a57db6c7f7bd879f545502947d8c1ba0363d9fbca6f10af36f232952ce79fb4e15a46ef0a51a83f6d6bc37972d568113f8945e417637aece
+SHA512 (SpacebrewYun-1.0.1.zip) =
ec9f499db57d3f86e8615b1a56ae61781add99e9fe4c38ba9faa85d2f7d61090e345a63e8ba4a189c62650631ea5be5cbf22dfb39920a63873408a55c40ac133
+SHA512 (Temboo-1.2.1.zip) =
4ce89b50cb93f85416b35dc218ad4d5fe0768032d146780d82f1d5d834a24dd831ecc4f1bcfa26d740643a3a7f297cdcec4d19bbf1216482d592d44dcbe2f27c
+SHA512 (Esplora-1.0.4.zip) =
10665b20d907d586bbe22345799e989b835aaa188040b269ed2925a7b4990c6fb368f0e5afd6c4bed265f2baafc815839ff7c53b5da4940e5338090f39e9c13b
+SHA512 (Mouse-1.0.1.zip) =
be0edd798cafa327752c2d2906193be81bcd214a0f406aca646c043ee527e1c398bde8636b35710b4d02074f01c398147fe2bab7108626d80b4181c0c40aa313
+SHA512 (Keyboard-1.0.1.zip) =
583328acb8e771b59f3e5bed02892740bcd840baafe63f12850e2c43ae7d05ad31bcc19c5e591e73ab29165952d2a7669bbd07b234dd3abd4c38ea54baf22eec
+SHA512 (SD-1.1.1.zip) =
b24c2ac276cb531043665b835a1d372294a34ddc2dda12c117b26e4ff33e31975b880e878b17d5798dc18f106091c3b60b6546a672267cf8937c4b0245a85342
+SHA512 (Servo-1.1.2.zip) =
ade1d725c071e97dc027bc654a1c4b79d3cd6c75bf45bac9c3dfed394451b1661c2488217562515fbb8e29698c7df66e30f8178cea40c7f82056546aa857e348
+SHA512 (Adafruit_CircuitPlayground-1.6.4.zip) =
f2a45282f68a236d2db5fa38f49dc2f95ed08331773f2dc933406e1ebeb1bb3987e4245d156b3254592a4e291008a566d9e000888d699161989b09ca0aa9a7d3
+SHA512 (WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip) =
f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9
commit 78681f4751362244fbb5fd01e3c7058ee159eaeb
Author: Gianluca Sforna <giallu(a)gmail.com>
Date: Thu Aug 17 08:47:07 2017 +0200
limit build to arches where arduino-builder is available
diff --git a/arduino.spec b/arduino.spec
index 7e986c5..7a5c9ce 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,7 +1,7 @@
Name: arduino
Epoch: 1
Version: 1.6.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: An IDE for Arduino-compatible electronics prototyping platforms
Group: Development/Tools
License: GPLv2+ and LGPLv2+ and CC-BY-SA
@@ -46,6 +46,9 @@ Requires: bouncycastle-pg jackson-databind jackson-module-mrbean
Requires: jakarta-commons-httpclient objectweb-asm astyle
Requires: rsyntaxtextarea
Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+# require arduino-builder, which is a go project and won't exist outside these
arches
+ExclusiveArch: %{go_arches}
Requires: arduino-builder
# This patch skips the init process for OSX platforms.