[Arch-excludes] Architecture specific change in rpms/arduino.git

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=5b3376bdd4601....

Change: +ExclusiveArch: %{go_arches}

Thanks.

Full change: ============

commit f824a157950c82b70fff664bd547040070d619ab Author: ElXreno elxreno@gmail.com Date: Wed Apr 15 22:02:09 2020 +0300

Updated to version 1.8.12

diff --git a/.gitignore b/.gitignore index 68cd1e4..dde741d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /*.zip /*.gz +/*.bz2 /*.sig /*.rpm diff --git a/arduino-1.8.3-armbuild.patch b/arduino-1.8.3-armbuild.patch deleted file mode 100644 index ca74636..0000000 --- a/arduino-1.8.3-armbuild.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-script.patch b/arduino-1.8.3-script.patch deleted file mode 100644 index f3faee3..0000000 --- a/arduino-1.8.3-script.patch +++ /dev/null @@ -1,65 +0,0 @@ -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 slf4j-nop - --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 deleted file mode 100644 index 74f80b7..0000000 --- a/arduino-1.8.3-use-system-astyle.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 deleted file mode 100644 index a900b94..0000000 --- a/arduino-1.8.3-use-system-avrdude.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index f57a975..0000000 --- a/arduino-1.8.3-use-system-libserialport.patch +++ /dev/null @@ -1,37 +0,0 @@ -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-1.8.5-macosx.patch b/arduino-1.8.5-macosx.patch deleted file mode 100644 index f6ede87..0000000 --- a/arduino-1.8.5-macosx.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java -index 477f931..f64235f 100644 ---- a/app/src/processing/app/Base.java -+++ b/app/src/processing/app/Base.java -@@ -49,7 +49,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; -@@ -132,14 +131,6 @@ public class Base { - } - System.setProperty("java.net.useSystemProxies", "true"); - -- if (OSUtils.isMacOS()) { -- System.setProperty("apple.laf.useScreenMenuBar", -- String.valueOf(!System.getProperty("os.version").startsWith("10.13") -- || com.apple.eawt.Application.getApplication().isAboutMenuItemPresent())); -- -- ThinkDifferent.init(); -- } -- - try { - INSTANCE = new Base(args); - } catch (Throwable e) { diff --git a/arduino-add-to-groups.patch b/arduino-add-to-groups.patch index e1946f5..a15a334 100644 --- a/arduino-add-to-groups.patch +++ b/arduino-add-to-groups.patch @@ -4,7 +4,7 @@ index 0000000..1f27e51 --- /dev/null +++ b/build/linux/dist/arduino-add-groups @@ -0,0 +1,23 @@ -+#!/bin/bash ++#!/usr/bin/bash + +uid=${PKEXEC_UID:-${SUDO_UID}} + @@ -55,3 +55,4 @@ index 0000000..197d5ee + </action> + +</policyconfig> + diff --git a/arduino-drop-macosx.patch b/arduino-drop-macosx.patch new file mode 100644 index 0000000..a6dd534 --- /dev/null +++ b/arduino-drop-macosx.patch @@ -0,0 +1,171 @@ +diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java +index 815f264d..1ebfa540 100644 +--- a/app/src/processing/app/Base.java ++++ b/app/src/processing/app/Base.java +@@ -53,7 +53,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.packages.UserLibraryFolder.Location; +@@ -138,14 +137,6 @@ public class Base { + } + System.setProperty("java.net.useSystemProxies", "true"); + +- if (OSUtils.isMacOS()) { +- System.setProperty("apple.laf.useScreenMenuBar", +- String.valueOf(!System.getProperty("os.version").startsWith("10.13") +- || com.apple.eawt.Application.getApplication().isAboutMenuItemPresent())); +- +- ThinkDifferent.init(); +- } +- + try { + INSTANCE = new Base(args); + } catch (Throwable e) { +diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java +index d37d0cc9..8cfbee31 100644 +--- a/app/src/processing/app/EditorToolbar.java ++++ b/app/src/processing/app/EditorToolbar.java +@@ -27,10 +27,6 @@ import javax.imageio.ImageIO; + import javax.swing.*; + import javax.swing.event.MouseInputListener; + +-import com.thizzer.jtouchbar.JTouchBar; +-import com.thizzer.jtouchbar.item.TouchBarItem; +-import com.thizzer.jtouchbar.item.view.TouchBarButton; +- + import cc.arduino.contributions.VersionComparator; + import processing.app.helpers.OSUtils; + +@@ -106,13 +102,10 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key + private final Color bgcolor; + + private static Image[][] buttonImages; +- private static com.thizzer.jtouchbar.common.Image[][] touchBarImages; + private int currentRollover; + + private JPopupMenu popup; + private final JMenu menu; +- private JTouchBar touchBar; +- private TouchBarButton[] touchBarButtons; + + private int buttonCount; + private int[] state = new int[BUTTON_COUNT]; +@@ -149,61 +142,11 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key + bgcolor = Theme.getColor("buttons.bgcolor"); + statusFont = Theme.getFont("buttons.status.font"); + statusColor = Theme.getColor("buttons.status.color"); +- +- if (OSUtils.isMacOS() && VersionComparator.greaterThanOrEqual(OSUtils.version(), "10.12")) { +- editor.addWindowListener(new WindowAdapter() { +- public void windowActivated(WindowEvent e) { +- if (touchBar == null) { +- buildTouchBar(); +- +- touchBar.show(editor); +- } +- } +- }); +- } + + addMouseListener(this); + addMouseMotionListener(this); + KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this); + } +- +- private void buildTouchBar() { +- if (touchBarImages == null) { +- loadTouchBarImages(); +- } +- +- touchBar = new JTouchBar(); +- touchBarButtons = new TouchBarButton[BUTTON_COUNT]; +- touchBar.setCustomizationIdentifier("Arduino"); +- +- for (int i = 0; i < BUTTON_COUNT; i++) { +- final int selection = i; +- +- // add spacers before NEW and SERIAL buttons +- if (i == NEW) { +- touchBar.addItem(new TouchBarItem(TouchBarItem.NSTouchBarItemIdentifierFixedSpaceSmall)); +- } else if (i == SERIAL) { +- touchBar.addItem(new TouchBarItem(TouchBarItem.NSTouchBarItemIdentifierFlexibleSpace)); +- } +- +- touchBarButtons[i] = new TouchBarButton(); +- touchBarButtons[i].setImage(touchBarImages[i][ROLLOVER]); +- touchBarButtons[i].setAction(event -> { +- // Run event handler later to prevent hanging if a dialog needs to be open +- EventQueue.invokeLater(new Runnable() { +- @Override +- public void run() { +- handleSelectionPressed(selection); +- } +- }); +- }); +- +- TouchBarItem touchBarItem = new TouchBarItem(title[i], touchBarButtons[i], true); +- touchBarItem.setCustomizationLabel(title[i]); +- +- touchBar.addItem(touchBarItem); +- } +- } + + private void loadButtons() { + Image allButtons = Theme.getThemeImage("buttons", this, +@@ -224,36 +167,6 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key + } + } + } +- +- private void loadTouchBarImages() { +- Image allButtonsRetina = Theme.getThemeImage("buttons", this, +- BUTTON_IMAGE_SIZE * BUTTON_COUNT * 2, +- BUTTON_IMAGE_SIZE * 3 * 2); +- touchBarImages = new com.thizzer.jtouchbar.common.Image[BUTTON_COUNT][3]; +- +- for (int i = 0; i < BUTTON_COUNT; i++) { +- for (int state = 0; state < 3; state++) { +- BufferedImage image = new BufferedImage(BUTTON_WIDTH * 2, BUTTON_HEIGHT * 2, +- BufferedImage.TYPE_INT_ARGB); +- Graphics g = image.getGraphics(); +- +- int offset = (BUTTON_IMAGE_SIZE * 2 - BUTTON_WIDTH * 2) / 2; +- g.drawImage(allButtonsRetina, -(i * BUTTON_IMAGE_SIZE * 2) - offset, +- (-2 + state) * BUTTON_IMAGE_SIZE * 2, null); +- +- // convert the image to a PNG to display on the touch bar +- ByteArrayOutputStream pngStream = new ByteArrayOutputStream(); +- +- try { +- ImageIO.write(image, "PNG", pngStream); +- +- touchBarImages[i][state] = new com.thizzer.jtouchbar.common.Image(pngStream.toByteArray()); +- } catch (IOException e) { +- // ignore errors +- } +- } +- } +- } + + @Override + public void paintComponent(Graphics screen) { +@@ -402,15 +315,6 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key + if (updateAfter) { + repaint(); + } +- +- if (touchBarButtons != null) { +- if (newState == INACTIVE) { +- // use ROLLOVER state when INACTIVE +- newState = ROLLOVER; +- } +- +- touchBarButtons[slot].setImage(touchBarImages[slot][newState]); +- } + } + + diff --git a/arduino-fix-path-to-builder.patch b/arduino-fix-path-to-builder.patch new file mode 100644 index 0000000..5c5876d --- /dev/null +++ b/arduino-fix-path-to-builder.patch @@ -0,0 +1,13 @@ +diff --git a/arduino-core/src/cc/arduino/Compiler.java b/arduino-core/src/cc/arduino/Compiler.java +index c2c5b0ff..36904e82 100644 +--- a/arduino-core/src/cc/arduino/Compiler.java ++++ b/arduino-core/src/cc/arduino/Compiler.java +@@ -232,7 +232,7 @@ public class Compiler implements MessageConsumer { + + private void callArduinoBuilder(TargetBoard board, TargetPlatform platform, TargetPackage aPackage, String vidpid, BuilderAction action, OutputStream outStream, OutputStream errStream) throws RunnerException { + List<String> cmd = new ArrayList<>(); +- cmd.add(BaseNoGui.getContentFile("arduino-builder").getAbsolutePath()); ++ cmd.add("/usr/bin/arduino-builder"); + cmd.add(action.value); + cmd.add("-logger=machine"); + diff --git a/arduino-no-network.patch b/arduino-no-network.patch deleted file mode 100644 index 944818a..0000000 --- a/arduino-no-network.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/build/build.xml b/build/build.xml -index 9e955d9..34d5972 100644 ---- a/build/build.xml -+++ b/build/build.xml -@@ -162,7 +162,7 @@ - - <mkdir dir="${target.path}/reference"/> - -- <!-- Unzip documentation --> -+ <!-- Unzip documentation> - <antcall target="unzip"> - <param name="archive_file" value="shared/reference-1.6.6-3.zip" /> - <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" /> -@@ -180,7 +180,7 @@ - <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" /> - <param name="final_folder" value="${target.path}/reference/Edison_help_files" /> - <param name="dest_folder" value="${target.path}/reference/" /> -- </antcall> -+ </antcall--> - - <!-- Write the revision file! --> - <echo file="${target.path}/lib/version.txt" message="${version}" /> -@@ -573,7 +573,7 @@ - <fileset dir="linux/work" includes="**/*.sh" /> - </chmod> - -- <antcall target="unzip"> -+ <!--antcall target="unzip"> - <param name="archive_file" value="./libastylej-2.05.1.zip" /> - <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" /> - <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" /> -@@ -584,7 +584,7 @@ - - <antcall target="portable-${portable}"> - <param name="parentdir" value="linux/work" /> -- </antcall> -+ </antcall!--> - </target> - - <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version"> -@@ -592,7 +592,7 @@ - <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/> - </antcall> - -- <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/> -+ <!--delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/> - <mkdir dir="${staging_folder}/arduino-builder-linux32"/> - <antcall target="untar"> - <param name="archive_file" value="./arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" /> -@@ -606,15 +606,15 @@ - <copy todir="linux/work/hardware" overwrite="true"> - <fileset dir="${staging_folder}/arduino-builder-linux32/hardware" includes="*.txt"/> - </copy> -- <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/> -+ <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"--> - -- <antcall target="avr-toolchain-bundle"> -+ <!--antcall target="avr-toolchain-bundle"> - <param name="unpack_target" value="untar"/> - <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/> - <param name="gcc_version" value="4.8.1-arduino5"/> - <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/> - <param name="avrdude_version" value="6.0.1-arduino5"/> -- </antcall> -+ </antcall--> - - <antcall target="package-library-index-json-bundle"/> - </target> -@@ -624,7 +624,7 @@ - <param name="JVM" value="${LINUX64_BUNDLED_JVM}"/> - </antcall> - -- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/> -+ <!--delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/> - <mkdir dir="${staging_folder}/arduino-builder-linux64"/> - <antcall target="untar"> - <param name="archive_file" value="./arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" /> -@@ -638,15 +638,15 @@ - <copy todir="linux/work/hardware" overwrite="true"> - <fileset dir="${staging_folder}/arduino-builder-linux64/hardware" includes="*.txt"/> - </copy> -- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/> -+ <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/--> - -- <antcall target="avr-toolchain-bundle"> -+ <!--antcall target="avr-toolchain-bundle"> - <param name="unpack_target" value="untar"/> - <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/> - <param name="gcc_version" value="4.8.1-arduino5"/> - <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/> - <param name="avrdude_version" value="6.0.1-arduino5"/> -- </antcall> -+ </antcall--> - - <antcall target="package-library-index-json-bundle"/> - </target> -@@ -685,7 +685,10 @@ - - <!-- Retrieve tool --> - <target name="untar-unzip-download" depends="untar-unzip-check" unless="${archive_file}_available"> -- <get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" /> -+ <fail>Network access not allowed. -+ Build system tried to download file ${archive_file}. -+ Please add it to RPM spec Sources instead -+ </fail> - </target> - - <target name="untar-unzip-checksum" depends="untar-unzip-download"> -@@ -1022,15 +1025,18 @@ - <target name="package-library-index-json-bundle"> - <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/../dist/"/> - -- <get src="http://downloads.arduino.cc/packages/package_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" /> -- <gunzip src="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/> -- <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz"/> -- -- <get src="http://downloads.arduino.cc/packages/package_index.json.sig" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" /> -- -- <get src="http://downloads.arduino.cc/libraries/library_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" /> -- <gunzip src="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/> -- <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz"/> -+ <exec executable="cp" failonerror="true"> -+ <arg value="../package_index.json" /> -+ <arg value="${staging_folder}/work/${staging_hardware_folder}/../dist/" /> -+ </exec> -+ <exec executable="cp" failonerror="true"> -+ <arg value="../package_index.json.sig" /> -+ <arg value="${staging_folder}/work/${staging_hardware_folder}/../dist/" /> -+ </exec> -+ <exec executable="cp" failonerror="true"> -+ <arg value="../library_index.json" /> -+ <arg value="${staging_folder}/work/${staging_hardware_folder}/../dist/" /> -+ </exec> - - <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/> - </target> diff --git a/arduino-use-system-astyle.patch b/arduino-use-system-astyle.patch new file mode 100644 index 0000000..ba8a64b --- /dev/null +++ b/arduino-use-system-astyle.patch @@ -0,0 +1,72 @@ +diff --git a/app/src/cc/arduino/packages/formatter/AStyleInterface.java b/app/src/cc/arduino/packages/formatter/AStyleInterface.java +index 4224bf16..96ffbda5 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/build/build.xml b/build/build.xml +index 6ddec060..a3bfcf29 100644 +--- a/build/build.xml ++++ b/build/build.xml +@@ -656,14 +656,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-5.zip" /> + <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.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" /> +@@ -681,14 +681,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-5.zip" /> + <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.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" /> +@@ -724,14 +724,14 @@ + </target> + + <target name="linux-libastyle-aarch64" depends="linux-build" description="Download libastyle.so for AArch64"> +- <antcall target="unzip"> ++ <!--<antcall target="unzip"> + <param name="archive_file" value="./libastylej-2.05.1-5.zip" /> + <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.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_aarch64.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-use-system-avrdude.patch b/arduino-use-system-avrdude.patch new file mode 100644 index 0000000..5eb0fa1 --- /dev/null +++ b/arduino-use-system-avrdude.patch @@ -0,0 +1,25 @@ +diff --git a/hardware/avr/platform.txt b/hardware/avr/platform.txt +index 608ad29..6c4aaa6 100644 +--- a/hardware/avr/platform.txt ++++ b/hardware/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 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}{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.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA + diff --git a/arduino-use-system-libserialport.patch b/arduino-use-system-libserialport.patch new file mode 100644 index 0000000..530b638 --- /dev/null +++ b/arduino-use-system-libserialport.patch @@ -0,0 +1,55 @@ +diff --git a/build/build.xml b/build/build.xml +index 6ddec060..cd2abfe4 100644 +--- a/build/build.xml ++++ b/build/build.xml +@@ -669,14 +669,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> + +@@ -694,14 +694,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> + +@@ -737,14 +737,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}/aarch64/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> + + <target name="linuxaarch64-build" depends="linux-libastyle-aarch64" description="Build Linux (AArch64) version"> diff --git a/arduino-wrapper.patch b/arduino-wrapper.patch new file mode 100644 index 0000000..23caa90 --- /dev/null +++ b/arduino-wrapper.patch @@ -0,0 +1,87 @@ +diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino +index f70c6508..fe88828f 100755 +--- a/build/linux/dist/arduino ++++ b/build/linux/dist/arduino +@@ -1,36 +1,62 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash ++ ++APPDIR="/usr/share/arduino" ++ ++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 + +-APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )" ++source /usr/share/java-utils/java-functions ++ ++set_classpath \ ++ batik \ ++ bcpg \ ++ bcprov \ ++ commons-codec \ ++ commons-compress \ ++ commons-exec \ ++ commons-httpclient \ ++ commons-io \ ++ commons-lang3 \ ++ commons-logging \ ++ commons-net \ ++ jackson-annotations \ ++ jackson-core \ ++ jackson-databind \ ++ jmdns \ ++ jsch \ ++ jsemver \ ++ jssc \ ++ objectweb-asm \ ++ rsyntaxtextarea \ ++ slf4j \ ++ xml-commons-apis-ext \ ++ xmlgraphics-commons \ + + for LIB in \ +- "$APPDIR"/java/lib/rt.jar \ +- "$APPDIR"/java/lib/tools.jar \ + "$APPDIR"/lib/*.jar \ ++ /usr/share/java/jackson-modules/jackson-module-mrbean.jar \ ++ /usr/share/java/log4j/log4j-api.jar \ ++ /usr/share/java/log4j/log4j-core.jar \ + ; + do + CLASSPATH="${CLASSPATH}:${LIB}" + done + export CLASSPATH + +-LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +-export LD_LIBRARY_PATH +- +-export PATH="${APPDIR}/java/bin:${PATH}" +- +-export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'` +- +-JAVA=java +-if [ -x "$APPDIR/java/bin/java" ]; then +- JAVA=$APPDIR/java/bin/java +-fi +- +-# Collect options to java in an array, to properly handle whitespace in options + JAVA_OPTIONS=("-DAPP_DIR=$APPDIR") + +-# Only show the splash screen when no options are present + if [[ "$@" != *"--"* ]] ; then +- JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png") ++ JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png") + fi + +-"$JAVA" "${JAVA_OPTIONS[@]}" processing.app.Base "$@" ++java "${JAVA_OPTIONS[@]}" processing.app.Base "$@" + diff --git a/arduino.spec b/arduino.spec index 63c4ed1..c7f71d9 100644 --- a/arduino.spec +++ b/arduino.spec @@ -1,74 +1,104 @@ +%global antflags -Dno_arduino_builder=true -Dsystem_avr=true -Dlight_bundle=true + +%global appstream_id cc.arduino.arduinoide + +%global avr_version 1.8.2 +%global ethernet_version 2.0.0 +%global gsm_version 1.0.6 +%global stepper_version 1.1.3 +%global tft_version 1.0.6 +%global wifi_version 1.2.7 +%global firmata_version 2.5.8 +%global bridge_version 1.7.0 +%global robot_control_version 1.0.4 +%global robot_motor_version 1.0.3 +%global robotirremote_version 2.0.0 +%global spacebrewyun_version 1.0.2 +%global temboo_version 1.2.1 +%global esplora_version 1.0.4 +%global mouse_version 1.0.1 +%global keyboard_version 1.0.2 +%global sd_version 1.2.4 +%global servo_version 1.1.6 +%global liquidcrystal_version 1.0.7 +%global adafruit_version 1.10.4 + +%global reference_version 1.6.6-3 +%global wifi_firmware_updater_version 0.10.10 + Name: arduino -# Once there's an Epoch it can never be removed or decremented Epoch: 1 -Version: 1.8.5 -Release: 12%{?dist} +Version: 1.8.12 +Release: 1%{?dist} Summary: An IDE for Arduino-compatible electronics prototyping platforms

License: GPLv2+ and LGPLv2+ and CC-BY-SA URL: https://www.arduino.cc/ - -# There are a lot of binaries in the "source" tarball. -# These binaries are removed in the prep section of the SPEC file. -Source0: https://github.com/arduino/Arduino/archive/%%7Bversion%7D.tar.gz#/%%7Bname%7... - -# Additional files needed for packaging -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 - -# Additional libs -Source4: https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip#/Firmata-2.5.... -Source5: https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip#/Bridge-1.6.3.... -Source6: https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip#/Robot_... -Source7: https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip#/Robot_Mo... -Source8: https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip#/RobotI... -Source9: https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip#/Spacebr... -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.0.... -Source12: https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip#/Mouse-1.0.1.zi... -Source13: https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip#/Keyboard-1.... -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.zi... -Source16: https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip#/Liquid... -Source17: https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip#/Ad... -Source18: https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases... - -# This patch skips the init process for OSX platforms. -Patch0: arduino-1.8.5-macosx.patch -# Redirects Arduino to system avr-gcc and avrdude utilities -Patch2: arduino-1.8.3-use-system-avrdude.patch -Patch3: arduino-add-to-groups.patch -Patch4: arduino-1.8.3-script.patch -# Redirects Arduino to system astyle libraries -Patch5: arduino-1.8.3-use-system-astyle.patch -# Allows Arduino to build on non-intel systems -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 - -BuildRequires: java-1.8.0-openjdk-devel -BuildRequires: jpackage-utils ant ant-apache-regexp desktop-file-utils ecj jna -BuildRequires: jmdns jsemver apache-commons-net apache-commons-codec git -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 batik xml-commons-apis xmlgraphics-commons +Source0: https://github.com/arduino/Arduino/archive/%%7Bversion%7D/%%7Bname%7D-%%7Bve... + +Source10: https://downloads.arduino.cc/cores/avr-%%7Bavr_version%7D.tar.bz2 +Source11: https://github.com/arduino-libraries/Ethernet/archive/%%7Bethernet_version%7... +Source12: https://github.com/arduino-libraries/GSM/archive/%%7Bgsm_version%7D/GSM-%%7B... +Source13: https://github.com/arduino-libraries/Stepper/archive/%%7Bstepper_version%7D/... +Source14: https://github.com/arduino-libraries/TFT/archive/%%7Btft_version%7D/TFT-%%7B... +Source15: https://github.com/arduino-libraries/WiFi/archive/%%7Bwifi_version%7D/WiFi-%... +Source16: https://github.com/firmata/arduino/archive/%%7Bfirmata_version%7D/Firmata-%%... +Source17: https://github.com/arduino-libraries/Bridge/archive/%%7Bbridge_version%7D/Br... +Source18: https://github.com/arduino-libraries/Robot_Control/archive/%%7Brobot_control... +Source19: https://github.com/arduino-libraries/Robot_Motor/archive/%%7Brobot_motor_ver... +Source20: https://github.com/arduino-libraries/RobotIRremote/archive/%%7Brobotirremote... +Source21: https://github.com/arduino-libraries/SpacebrewYun/archive/%%7Bspacebrewyun_v... +Source22: https://github.com/arduino-libraries/Temboo/archive/%%7Btemboo_version%7D/Te... +Source23: https://github.com/arduino-libraries/Esplora/archive/%%7Besplora_version%7D/... +Source24: https://github.com/arduino-libraries/Mouse/archive/%%7Bmouse_version%7D/Mous... +Source25: https://github.com/arduino-libraries/Keyboard/archive/%%7Bkeyboard_version%7... +Source26: https://github.com/arduino-libraries/SD/archive/%%7Bsd_version%7D/SD-%%7Bsd_... +Source27: https://github.com/arduino-libraries/Servo/archive/%%7Bservo_version%7D/Serv... +Source28: https://github.com/arduino-libraries/LiquidCrystal/archive/%%7Bliquidcrystal... +Source29: https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/%%7Badafruit_... + +Source50: https://downloads.arduino.cc/reference-%%7Breference_version%7D.zip +Source51: https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases... + +Patch0: arduino-use-system-avrdude.patch +Patch1: arduino-use-system-astyle.patch +Patch2: arduino-use-system-libserialport.patch +Patch3: arduino-drop-macosx.patch +Patch4: arduino-wrapper.patch +Patch5: arduino-add-to-groups.patch +Patch6: arduino-fix-path-to-builder.patch + +BuildRequires: ant +BuildRequires: desktop-file-utils BuildRequires: libappstream-glib +BuildRequires: javapackages-tools +BuildRequires: java-devel + +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) +BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-mrbean) +BuildRequires: mvn(com.fifesoft:rsyntaxtextarea) +BuildRequires: mvn(com.github.zafarkhaja:java-semver) +BuildRequires: mvn(com.jcraft:jsch) +BuildRequires: mvn(commons-codec:commons-codec) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(org.apache.commons:commons-compress) +BuildRequires: mvn(org.apache.commons:commons-exec) +BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.apache.commons:commons-logging) +BuildRequires: mvn(org.apache.commons:commons-net) +BuildRequires: mvn(org.apache.logging.log4j:log4j-api) +BuildRequires: mvn(org.apache.xmlgraphics:batik-all) +BuildRequires: mvn(org.bouncycastle:bcpg-jdk15) +BuildRequires: mvn(org.jmdns:jmdns) +BuildRequires: mvn(org.scream3r:jssc)

-Requires: java-1.8.0-openjdk -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 libserialport -Requires: rsyntaxtextarea batik xml-commons-apis xmlgraphics-commons Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: arduino-listSerialPortsC +Requires: javapackages-tools +Requires: polkit

-# require arduino-builder, which is a go project and won't exist outside these arches +# Require arduino-builder, which is a go project and won't exist outside these arches ExclusiveArch: %{go_arches} Requires: arduino-builder >= 1.3.25

@@ -83,12 +113,43 @@ objects or environments. This package contains an IDE that can be used to develop and upload code to the micro-controller.

-%package -n %{name}-core -Summary: Files required for compiling code for Arduino-compatible micro-controllers -Requires: avr-gcc avr-gcc-c++ avr-libc avrdude - +%package core +Summary: Files required for compiling code for Arduino-compatible micro-controllers

-%description -n %{name}-core +Requires: arduino-listSerialPortsC +Requires: astyle +Requires: avrdude +Requires: avr-gcc +Requires: avr-gcc-c++ +Requires: avr-libc +Requires: java-headless + +Requires: mvn(apache:commons-httpclient) +Requires: mvn(com.fasterxml.jackson.core:jackson-annotations) +Requires: mvn(com.fasterxml.jackson.core:jackson-core) +Requires: mvn(com.fasterxml.jackson.core:jackson-databind) +Requires: mvn(com.fasterxml.jackson.module:jackson-module-mrbean) +Requires: mvn(com.fifesoft:rsyntaxtextarea) +Requires: mvn(com.github.zafarkhaja:java-semver) +Requires: mvn(com.jcraft:jsch) +Requires: mvn(commons-codec:commons-codec) +Requires: mvn(commons-io:commons-io) +Requires: mvn(org.apache.commons:commons-compress) +Requires: mvn(org.apache.commons:commons-exec) +Requires: mvn(org.apache.commons:commons-lang3) +Requires: mvn(org.apache.commons:commons-logging) +Requires: mvn(org.apache.commons:commons-net) +Requires: mvn(org.apache.logging.log4j:log4j-api) +Requires: mvn(org.apache.xmlgraphics:batik-all) +Requires: mvn(org.apache.xmlgraphics:xmlgraphics-commons) +Requires: mvn(org.bouncycastle:bcpg-jdk15) +Requires: mvn(org.jmdns:jmdns) +Requires: mvn(org.ow2.asm:asm-all) +Requires: mvn(org.scream3r:jssc) +Requires: mvn(org.slf4j:slf4j-api) +Requires: mvn(xml-apis:xml-apis) + +%description core Arduino is an open-source electronics prototyping platform based on flexible, easy-to-use hardware and software. It's intended for artists, designers, hobbyists, and anyone interested in creating interactive @@ -97,13 +158,10 @@ objects or environments. This package contains the core files required to compile and upload Arduino code.

+%package doc +Summary: Documentation for the Arduino micro-controller platform

-%package -n %{name}-doc -Summary: Documentation for the Arduino micro-controller platform -Requires: avr-gcc avr-gcc-c++ avr-libc avrdude - - -%description -n %{name}-doc +%description doc Arduino is an open-source electronics prototyping platform based on flexible, easy-to-use hardware and software. It's intended for artists, designers, hobbyists, and anyone interested in creating interactive @@ -111,184 +169,189 @@ objects or environments.

This package contains reference documentation.

+%package devel +Summary: Devel package for %{name} + +Requires: %{name}-core + +%description devel +Devel package for %{name}. +

%prep -%setup -q -n Arduino-%{version} -# Add downloaded files from arduino.cc -cp -p %SOURCE1 . -gunzip package_index.json.gz -cp -p %SOURCE2 . -cp -p %SOURCE3 . -gunzip library_index.json.gz - -# Add libraries -cp -p %SOURCE4 ./build -cp -p %SOURCE5 ./build -cp -p %SOURCE6 ./build -cp -p %SOURCE7 ./build -cp -p %SOURCE8 ./build -cp -p %SOURCE9 ./build -cp -p %SOURCE10 ./build -cp -p %SOURCE11 ./build -cp -p %SOURCE12 ./build -cp -p %SOURCE13 ./build -cp -p %SOURCE14 ./build -cp -p %SOURCE15 ./build -cp -p %SOURCE16 ./build -cp -p %SOURCE17 ./build -cp -p %SOURCE18 ./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 +%autosetup -n Arduino-%{version} -N + +tar -xvf %{SOURCE10} -C hardware + +# Need improve this moment... +# patch0 requires unpacked archive with hardware things +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 + +cp %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} %{SOURCE26} %{SOURCE27} %{SOURCE28} %{SOURCE29} build/ +cp %{SOURCE50} %{SOURCE51} build/shared/

# Remove Windows and OSX specific code find -type d ( -name macosx -o -name windows ) -print0 | xargs -0 rm -rf -# As mentioned earlier, binary forms are removed here. + +# Drop binaries find -name '*.elf' -delete find -name '*.class' -delete find -name '*.jar' -delete find -name '*.so' -delete

+# Disable update check 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" \ - "\nupdate.check=false" \ - >> build/shared/lib/preferences.txt - -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 batik xml-commons-apis-ext xmlgraphics-commons + "\nupdate.check=false" >> build/shared/lib/preferences.txt + +# Include requires jars to arduino-core/lib folder +build-jar-repository -p arduino-core/lib/ \ + apache-commons-codec \ + apache-commons-compress \ + apache-commons-exec \ + apache-commons-io \ + apache-commons-lang3 \ + apache-commons-logging \ + apache-commons-net \ + bcpg \ + bcprov \ + jackson-annotations \ + jackson-core \ + jackson-databind \ + jmdns \ + jsch \ + jsemver \ + jssc + +# Include few libraries manually +ln -s /usr/share/java/jackson-modules/jackson-module-mrbean.jar arduino-core/lib/jackson-module-mrbean.jar +ln -s /usr/share/java/log4j/log4j-api.jar arduino-core/lib/log4j-api.jar + +# Include requires jars to app/lib folder +build-jar-repository -p app/lib/ \ + apache-commons-compress \ + apache-commons-lang3 \ + batik \ + jsch \ + jsemver \ + jssc \ + rsyntaxtextarea + +# Include library manually +ln -s /usr/share/java/log4j/log4j-api.jar app/lib/log4j-api.jar

-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 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 %{antflags} -echo %{version} | ant dist %{antflags} -mv linux/%{name}*.tar.xz linux/%{name}-%{version}.tar.xz -tar -xf linux/%{name}-%{version}.tar.xz +echo %{version} | ant build %{antflags} +mkdir -p linux/work/hardware/arduino/ +mv ../hardware/*/ linux/work/hardware/arduino/ popd

-%install -%global appstream_id cc.arduino.arduinoide - -cd build/%{name}-%{version} - -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cp -a arduino $RPM_BUILD_ROOT%{_bindir}/ - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -a hardware lib examples $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -mkdir $RPM_BUILD_ROOT/%{_datadir}/%{name}/dist -mkdir $RPM_BUILD_ROOT/%{_datadir}/%{name}/tools-builder -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 - -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir} -cp -a ../../license.txt ../../README.md $RPM_BUILD_ROOT/%{_pkgdocdir}/

-# Requested upstream in http://github.com/arduino/Arduino/pull/4: -find $RPM_BUILD_ROOT -type f -iname *.jpg -or -iname *.java -or -iname *.pde -or -iname *.h -or -iname *.cpp -or -iname *.c -or -iname *.txt -or -iname makefile -or -iname key*.txt -or -iname pref*.txt | xargs chmod -x; - -cp -a lib/arduino-core.jar lib/pde.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/ +%install +pushd build

-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/hardware/%{name}/avr/boards.txt \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/hardware/%{name}/avr/programmers.txt \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/preferences.txt \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ -ln -s %{_sysconfdir}/%{name}/boards.txt \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/hardware/%{name}/avr/boards.txt -ln -s %{_sysconfdir}/%{name}/programmers.txt \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/hardware/%{name}/avr/programmers.txt -ln -s %{_sysconfdir}/%{name}/preferences.txt \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/preferences.txt +# Install wrapper +install -m 0755 -Dp linux/work/%{name} %{buildroot}%{_bindir}/%{name}

-ln -s %{_bindir}/arduino-builder $RPM_BUILD_ROOT%{_datadir}/%{name}/arduino-builder +# Install desktop file +cp -p linux/dist/desktop.template linux/dist/%{appstream_id}.desktop +desktop-file-install --dir=%{buildroot}%{_datadir}/applications --set-icon=%{appstream_id} --set-key=Exec --set-value=%{name} linux/dist/%{appstream_id}.desktop

-cp -p ../linux/dist/desktop.template ../linux/dist/%{appstream_id}.desktop -desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --set-icon=%{appstream_id} --set-key=Exec --set-value=%{name} ../linux/dist/%{appstream_id}.desktop +# Install app data +install -m 0644 -Dp linux/dist/appdata.xml %{buildroot}%{_datadir}/metainfo/%{appstream_id}.appdata.xml

-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages -cp -a ../linux/dist/mime.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{appstream_id}.xml +# Install mime data +install -m 0644 -Dp linux/dist/mime.xml %{buildroot}%{_datadir}/mime/packages/%{appstream_id}.xml

-for dir in ../shared/icons/*; do +# Install icons +for dir in shared/icons/*; do if [ -d $dir ] then size=`basename $dir` - mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps - cp $dir/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/%{appstream_id}.png + install -m 0644 -Dp $dir/apps/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/%{appstream_id}.png fi done

-install -D ../linux/dist/%{name}-add-groups $RPM_BUILD_ROOT%{_libexecdir}/%{name}-add-groups

-mkdir -p $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions -cp -a ../linux/dist/cc.arduino.add-groups.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions +# Install libs, examples, etc +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -ap linux/work/{examples,hardware,lib} %{buildroot}%{_datadir}/%{name}/

-mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo -cp -a ../linux/dist/appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/%{appstream_id}.appdata.xml +rm -rf \ + %{buildroot}%{_datadir}/%{name}/lib/*.jar \ + %{buildroot}%{_datadir}/%{name}/lib/desktop.template \ + %{buildroot}%{_datadir}/%{name}/lib/version.txt \ + %{buildroot}%{_datadir}/%{name}/hardware/tools

-%check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop -appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/*.appdata.xml +cp -a linux/work/lib/{arduino-core.jar,pde.jar} %{buildroot}%{_datadir}/%{name}/lib/

-# TODO -#pushd build -#ant test -#popd +install -m 0755 -Dp linux/dist/%{name}-add-groups %{buildroot}%{_libexecdir}/%{name}-add-groups +install -m 0644 -Dp linux/dist/cc.arduino.add-groups.policy %{buildroot}%{_datadir}/polkit-1/actions/cc.arduino.add-groups.policy

+# Install configs +mkdir -p %{buildroot}%{_sysconfdir}/%{name} +ln -s %{_datadir}/%{name}/hardware/avr/boards.txt %{buildroot}%{_sysconfdir}/%{name}/boards.txt +ln -s %{_datadir}/%{name}/hardware/avr/programmers.txt %{buildroot}%{_sysconfdir}/%{name}/programmers.txt +ln -s %{_datadir}/%{name}/lib/preferences.txt %{buildroot}%{_sysconfdir}/%{name}/preferences.txt

-%files -%{_bindir}/* -%{_datadir}/%{name}/*.jar -%{_datadir}/%{name}/lib/* -%exclude %{_datadir}/%{name}/lib/version.txt -%{_datadir}/applications/%{appstream_id}.desktop -%{_datadir}/mime/packages/%{appstream_id}.xml -%{_datadir}/icons/hicolor/*/apps/%{appstream_id}.png -%{_datadir}/polkit-1/actions/cc.arduino.add-groups.policy -%{_libexecdir}/%{name}-add-groups -%{_datadir}/metainfo/%{appstream_id}.appdata.xml +popd

-%files -n %{name}-doc -%{_pkgdocdir}/

-%files -n %{name}-core +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml + +# Disabled because nothing provides org.fest.swing.* +# # Include requires jars to app/lib folder +# build-jar-repository -p app/test-lib/ \ +# jackson-databind \ +# junit +# +# # Include library manually +# ln -s /usr/share/java/jackson-modules/jackson-module-mrbean.jar app/test-lib/jackson-module-mrbean.jar +# +# pushd build +# ant test +# popd + + +%files core %license license.txt %doc README.md %dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/boards.txt -%config(noreplace) %{_sysconfdir}/%{name}/programmers.txt -%config(noreplace) %{_sysconfdir}/%{name}/preferences.txt +%config(noreplace) %{_sysconfdir}/%{name}/* %dir %{_datadir}/%{name} +%{_datadir}/%{name}/lib/ + +%files doc %{_datadir}/%{name}/examples/ + +%files devel %{_datadir}/%{name}/hardware/ -%{_datadir}/%{name}/libraries/ -%{_datadir}/%{name}/dist/ -%dir %{_datadir}/%{name}/lib -%dir %{_datadir}/%{name}/tools-builder -%{_datadir}/%{name}/lib/version.txt -%{_datadir}/%{name}/arduino-builder + +%files +%{_bindir}/%{name} +%{_libexecdir}/%{name}-add-groups +%{_datadir}/applications/%{appstream_id}.desktop +%{_datadir}/metainfo/%{appstream_id}.appdata.xml +%{_datadir}/mime/packages/%{appstream_id}.xml +%{_datadir}/icons/hicolor/*/apps/%{appstream_id}.png +%{_datadir}/polkit-1/actions/cc.arduino.add-groups.policy + +

%changelog +* Mon Apr 13 2020 ElXreno elxreno@gmail.com - 1:1.8.12-1 +- Updated to version 1.8.12 + * Mon Apr 13 2020 ElXreno elxreno@gmail.com - 1:1.8.5-12 - Fixed run script. RHBZ#1823195

diff --git a/sources b/sources index 3ff501f..573b11f 100644 --- a/sources +++ b/sources @@ -1,19 +1,23 @@ -SHA512 (Firmata-2.5.6.zip) = 95ec24ebc6033d4c54ab47f306df8d6d9ab0a666ab0f0123edf8e48cbd66e8c78ccbbd4ff1a4acc0ab16f83dd04957727386ed6d8034284ceec70a0462894526 -SHA512 (library_index.json.gz) = 13be25d6d483edf272cac7fdcb6a8e791a9280c52a67114351fde02824589967d782bcf177fdc749eb97472dd7d0b0d3fdb15d012446a7d6048935d45838815d -SHA512 (WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip) = f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9 -SHA512 (package_index.json.gz) = e8f2ea83192c88513a9b1bdbe170f728eececb9ad0560b9113803444f9e64b6f5369a09640b4553bca47fc0dabbf3723b7d71e81aa7a12d0284c42d79b75114b -SHA512 (package_index.json.sig) = 95a0d4532a35c7c4530ecbc65269c3518da1cfda5f4638c9fc8207b4c3e571aa84975192ed1bf994da25c743d18f58444c2b0d7c89431555586a3f1179f2ed23 -SHA512 (SpacebrewYun-1.0.1.zip) = ec9f499db57d3f86e8615b1a56ae61781add99e9fe4c38ba9faa85d2f7d61090e345a63e8ba4a189c62650631ea5be5cbf22dfb39920a63873408a55c40ac133 -SHA512 (RobotIRremote-2.0.0.zip) = ad38f813825137f60610d168d6352c871da6d8a39b4378764d82a997719c07c5c314816d8384e205599fc5da198465ed334a8794e7d477d55685eb8f7672acd4 -SHA512 (Robot_Motor-1.0.3.zip) = 92d108cc2ddb64e2580fab2cb3a157efb76c5204256332527c3fff67ebb8e520621cdc178738132d4e9ee9e2bcde99968b8f9d3c97c10f7d153792e57cfad111 -SHA512 (Robot_Control-1.0.4.zip) = 45f710dfc8084f9fcf1608a67978f72885aff06e2bbbcb2613f4e337df8621b0f952383a71a55198618b145df378a94321bd5be83929be897fdd95b6bb69cfe0 -SHA512 (Bridge-1.6.3.zip) = 6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5 -SHA512 (Adafruit_CircuitPlayground-1.6.8.zip) = 0f0d32841bb6987edfc0e9aa0af8d0f7cf68dd33bf07ff0ec4cdd0d9733bb092b97a4810d7a0828e1d38fb25ec58e8fd3c023f70dffa3b1397386a902c932491 +SHA512 (Adafruit_Circuit_Playground-1.10.4.zip) = 38fc5110ac8e844dbbf35f57483ffd8b00e92168c0c82d545c86b3b79e25009bf7cb86cfa07506f0bb19d21f91f33c830a937cc9b22d70796eaee134ba43c219 +SHA512 (arduino-1.8.12.tar.gz) = e2fb2c94fdc16d5ed47501d63da0ac72ed998e10fb0ab86ecd06cc391421eec351a43bc0f15c09571cbc04fafb9839ab68bb0648d790633f3a68a12ab410e3ed +SHA512 (avr-1.8.2.tar.bz2) = e2d006f0b6540dba6623baac07d36078987fe8efdac39c6d160ab018a6c93a96369ece1ee92de0fae4a58fd4e93db108d2395de06c68d84ed2743739ed466aac +SHA512 (Bridge-1.7.0.zip) = 2f036960d43d9fc653da09c5197d56cfaf3ac12385ea9bd7e299d3f9f6f3b1eb23f13c947912a34668cb3c9555e6607170eeab4cb9d38078e8857e191351c675 +SHA512 (Esplora-1.0.4.zip) = 10665b20d907d586bbe22345799e989b835aaa188040b269ed2925a7b4990c6fb368f0e5afd6c4bed265f2baafc815839ff7c53b5da4940e5338090f39e9c13b +SHA512 (Ethernet-2.0.0.zip) = 53b82a2a0f89a1b9351fa4492d0ed35c6fb4f137eae30bf40efc10c0da5979c29c5a8d804e2daba2ab754e46a5753d0178a1240df0018be52438006b17c6e663 +SHA512 (Firmata-2.5.8.zip) = 01f961ddbebab45562d036552206db600ebe6ed448532f069802f788d2a9723361ce531acaae94e5b61c72a89c52a588a758e7bb314647954633052b915e97e8 +SHA512 (GSM-1.0.6.zip) = b78362f6630c8c0442b24a1ada8d0754205e8a7d01a84b066231323ffa37e8c57fc3b11da0adcb152f92bdf64d19290d25bdb889ef85fe6d27fd9cedda249e9c +SHA512 (Keyboard-1.0.2.zip) = 40604cb54ce299450368c56483f0c121f8704089c85a7f3cba06f7716ce62d0ab283158e89940c053412f69e6b59c3e3da7cabaffe36b0dd70eb2cc03a043f0e SHA512 (LiquidCrystal-1.0.7.zip) = 352cbffeaced5e52d1e2b8f118681ce435425bf87c0d1b6c384d11127f371ebcf4a026a0d0320fc324285f959d76b6a28cadba8e038e337d020beca847fcd985 -SHA512 (Servo-1.1.2.zip) = ade1d725c071e97dc027bc654a1c4b79d3cd6c75bf45bac9c3dfed394451b1661c2488217562515fbb8e29698c7df66e30f8178cea40c7f82056546aa857e348 -SHA512 (SD-1.1.1.zip) = b24c2ac276cb531043665b835a1d372294a34ddc2dda12c117b26e4ff33e31975b880e878b17d5798dc18f106091c3b60b6546a672267cf8937c4b0245a85342 -SHA512 (Keyboard-1.0.1.zip) = 583328acb8e771b59f3e5bed02892740bcd840baafe63f12850e2c43ae7d05ad31bcc19c5e591e73ab29165952d2a7669bbd07b234dd3abd4c38ea54baf22eec SHA512 (Mouse-1.0.1.zip) = be0edd798cafa327752c2d2906193be81bcd214a0f406aca646c043ee527e1c398bde8636b35710b4d02074f01c398147fe2bab7108626d80b4181c0c40aa313 -SHA512 (Esplora-1.0.4.zip) = 10665b20d907d586bbe22345799e989b835aaa188040b269ed2925a7b4990c6fb368f0e5afd6c4bed265f2baafc815839ff7c53b5da4940e5338090f39e9c13b +SHA512 (reference-1.6.6-3.zip) = 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73 +SHA512 (RobotIRremote-2.0.0.zip) = ad38f813825137f60610d168d6352c871da6d8a39b4378764d82a997719c07c5c314816d8384e205599fc5da198465ed334a8794e7d477d55685eb8f7672acd4 +SHA512 (Robot_Control-1.0.4.zip) = 45f710dfc8084f9fcf1608a67978f72885aff06e2bbbcb2613f4e337df8621b0f952383a71a55198618b145df378a94321bd5be83929be897fdd95b6bb69cfe0 +SHA512 (Robot_Motor-1.0.3.zip) = 92d108cc2ddb64e2580fab2cb3a157efb76c5204256332527c3fff67ebb8e520621cdc178738132d4e9ee9e2bcde99968b8f9d3c97c10f7d153792e57cfad111 +SHA512 (SD-1.2.4.zip) = 47d76a93994528671872eb8f300046b2e557d2432a3cba8c6626501d039bdb4e996faad9e3237720857e1994077dd6e749d9e6b1404c5cfce2316e886a8f21e3 +SHA512 (Servo-1.1.6.zip) = debacf3febc89f1739b1fbe230a77c3323b558c294e9d186d272bb1c5b7b5e31279b9c0dcd4574d17ab9e479e4b575d8d09dd25c2102ae0f84f0fa3b78ce414c +SHA512 (SpacebrewYun-1.0.2.zip) = 4206241dc36b75fb5642e717fd825a876d0047f888647d93764bfb01ae7b331f4c96b8fa697d133bc640dc567c1aa2d0753f3af05b12bfa62d611f297a85199b +SHA512 (Stepper-1.1.3.zip) = 34c2d981b8deae287a3bd4863a68aab15c563720bbc8741594d8b50b04cf201c539a7b774f26fbb8f4e35fa2629d6df4a0f94dcb1e806ca0f51d97e09872595f SHA512 (Temboo-1.2.1.zip) = 4ce89b50cb93f85416b35dc218ad4d5fe0768032d146780d82f1d5d834a24dd831ecc4f1bcfa26d740643a3a7f297cdcec4d19bbf1216482d592d44dcbe2f27c -SHA512 (arduino-1.8.5.tar.gz) = f01b0401edc7ea5d58cb475776b816d05f289060613dd452ca71ecaf4a3a95c5e9ddb5f2cf06d3c165e9e0540c895f9eaea896a7974c88834de569944c4adbd2 +SHA512 (TFT-1.0.6.zip) = 21a7ea01c3f7eaacc06a409bdc90c87c61dff580b47456d82078591ffd24aa4fb82feb83e9d1e4e0784cbd51d50070104875eec004e88479a61099dec097924d +SHA512 (WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip) = eacd20bfcc759f0b0744629073d1debd3d4fd8a36e5948314d149902568158839965755b833a263a71c65d7092d9091a5d05695c01854d4fb308fbec3711bd3c +SHA512 (WiFi-1.2.7.zip) = 7f8f9a0a13f2d6007f50221a3a33798035aa1d5b11a2fd1fd4887e3b99b4221b7ff1fd60bbf945bf74be7ae961bdc969c8420c7de6d12d18d3be7dedc708a39c

commit 0b35c50a56c1107d59196a1682af768828be94b6 Author: ElXreno elxreno@gmail.com Date: Mon Apr 13 09:24:52 2020 +0300

Fixed run script. RHBZ#1823195

diff --git a/arduino-1.8.3-script.patch b/arduino-1.8.3-script.patch index 10f42b0..f3faee3 100644 --- a/arduino-1.8.3-script.patch +++ b/arduino-1.8.3-script.patch @@ -38,8 +38,8 @@ diff -up Arduino-1.8.3/build/linux/dist/arduino.scripts Arduino-1.8.3/build/linu +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 ++guava objectweb-asm jackson-annotations jakarta-commons-httpclient \ ++rsyntaxtextarea batik xml-commons-apis-ext xmlgraphics-commons slf4j-nop

-JAVA=java -if [ -x "$APPDIR/java/bin/java" ]; then diff --git a/arduino.spec b/arduino.spec index 9450dcf..63c4ed1 100644 --- a/arduino.spec +++ b/arduino.spec @@ -2,7 +2,7 @@ Name: arduino # Once there's an Epoch it can never be removed or decremented Epoch: 1 Version: 1.8.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: An IDE for Arduino-compatible electronics prototyping platforms

License: GPLv2+ and LGPLv2+ and CC-BY-SA @@ -289,6 +289,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/*.app %{_datadir}/%{name}/arduino-builder

%changelog +* Mon Apr 13 2020 ElXreno elxreno@gmail.com - 1:1.8.5-12 +- Fixed run script. RHBZ#1823195 + * Sat Apr 11 2020 Peter Robinson pbrobinson@fedoraproject.org - 1:1.8.5-11 - Re-add Epoch so package isn't a downgrade

commit 65a02dae3ac2d494c134efa32cfc093667e8c50d Author: vascom vascom2@gmail.com Date: Sun Apr 12 22:18:07 2020 +0300

Add epoch to Requires.

diff --git a/arduino.spec b/arduino.spec index a8f8dce..9450dcf 100644 --- a/arduino.spec +++ b/arduino.spec @@ -65,7 +65,7 @@ Requires: apache-commons-logging jsch guava jackson-annotations jssc Requires: bouncycastle-pg jackson-databind jackson-module-mrbean Requires: jakarta-commons-httpclient objectweb-asm astyle libserialport Requires: rsyntaxtextarea batik xml-commons-apis xmlgraphics-commons -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: arduino-listSerialPortsC

# require arduino-builder, which is a go project and won't exist outside these arches

commit 21f96026aae20005170b0996a6b143a21aa7edb6 Author: Peter Robinson pbrobinson@gmail.com Date: Sat Apr 11 11:43:45 2020 +0100

Re-add Epoch so package isn't a downgrade

diff --git a/arduino.spec b/arduino.spec index 01db15f..a8f8dce 100644 --- a/arduino.spec +++ b/arduino.spec @@ -1,6 +1,8 @@ Name: arduino +# Once there's an Epoch it can never be removed or decremented +Epoch: 1 Version: 1.8.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An IDE for Arduino-compatible electronics prototyping platforms

License: GPLv2+ and LGPLv2+ and CC-BY-SA @@ -287,6 +289,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/*.app %{_datadir}/%{name}/arduino-builder

%changelog +* Sat Apr 11 2020 Peter Robinson pbrobinson@fedoraproject.org - 1:1.8.5-11 +- Re-add Epoch so package isn't a downgrade + * Tue Apr 07 2020 ElXreno elxreno@gmail.com - 1:1.8.5-10 - Set proper java package

commit 5bb4a6bd2c3feb391f052574f914e56dc8d0a0df Author: ElXreno elxreno@gmail.com Date: Tue Apr 7 11:09:51 2020 +0300

Updated .gitignore file

diff --git a/.gitignore b/.gitignore index 91a0333..68cd1e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,44 +1,4 @@ -/arduino-0019.tar.bz2 -/arduino-0021.tar.bz2 -/arduino-0022.tar.bz2 -/arduino-1.0.tar.bz2 -/arduino-1.0.1.tar.xz -/arduino-1.0.5.tar.xz -/arduino-1.0.6.tar.xz -/arduino-1.6.4.tar.gz -/package_index.json.gz -/package_index.json.sig -/library_index.json.gz -/Firmata-2.4.4.zip -/Bridge-1.1.0.zip -/Robot_Control-1.0.2.zip -/Robot_Motor-1.0.2.zip -/RobotIRremote-1.0.2.zip -/SpacebrewYun-1.0.0.zip -/Temboo-1.1.4.zip -/Esplora-1.0.4.zip -/Mouse-1.0.0.zip -/Keyboard-1.0.0.zip -/arduino-1.6.6.tar.gz -/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 -/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 -/arduino-1.8.5.tar.gz +/*.zip +/*.gz +/*.sig +/*.rpm

commit 5b3376bdd4601d575bd66887cfb4b6cbf353dd8c Author: ElXreno elxreno@gmail.com Date: Tue Apr 7 11:07:23 2020 +0300

Reindent spec file

diff --git a/arduino.spec b/arduino.spec index 125ab3a..01db15f 100644 --- a/arduino.spec +++ b/arduino.spec @@ -1,75 +1,76 @@ -Name: arduino -Epoch: 1 -Version: 1.8.5 -Release: 10%{?dist} -Summary: An IDE for Arduino-compatible electronics prototyping platforms -License: GPLv2+ and LGPLv2+ and CC-BY-SA -URL: http://www.arduino.cc/ +Name: arduino +Version: 1.8.5 +Release: 10%{?dist} +Summary: An IDE for Arduino-compatible electronics prototyping platforms + +License: GPLv2+ and LGPLv2+ and CC-BY-SA +URL: https://www.arduino.cc/

# There are a lot of binaries in the "source" tarball. # These binaries are removed in the prep section of the SPEC file. -Source0: https://github.com/arduino/Arduino/archive/%%7Bversion%7D.tar.gz#/%%7Bname%7... - -# additional files needed for packaging -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/2.5.6.zip#/Firmata-2.5.... -Source5: https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip#/Bridge-1.6.3.... -Source6: https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip#/Robot_... -Source7: https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip#/Robot_Mo... -Source8: https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip#/RobotI... -Source9: https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip#/Spacebr... -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.0.... -Source12: https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip#/Mouse-1.0.1.zi... -Source13: https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip#/Keyboard-1.... -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.zi... -Source16: https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip#/Liquid... -Source17: https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip#/Ad... -Source18: https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases... - -BuildArch: noarch - -BuildRequires: java-1.8.0-openjdk-devel -BuildRequires: jpackage-utils ant ant-apache-regexp desktop-file-utils ecj jna -BuildRequires: jmdns jsemver apache-commons-net apache-commons-codec git -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 batik xml-commons-apis xmlgraphics-commons -BuildRequires: libappstream-glib -Requires: java-1.8.0-openjdk -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 libserialport -Requires: rsyntaxtextarea batik xml-commons-apis xmlgraphics-commons -Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: arduino-listSerialPortsC - -# require arduino-builder, which is a go project and won't exist outside these arches -ExclusiveArch: %{go_arches} -Requires: arduino-builder >= 1.3.25 - +Source0: https://github.com/arduino/Arduino/archive/%%7Bversion%7D.tar.gz#/%%7Bname%7... + +# Additional files needed for packaging +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 + +# Additional libs +Source4: https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip#/Firmata-2.5.... +Source5: https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip#/Bridge-1.6.3.... +Source6: https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip#/Robot_... +Source7: https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip#/Robot_Mo... +Source8: https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip#/RobotI... +Source9: https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip#/Spacebr... +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.0.... +Source12: https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip#/Mouse-1.0.1.zi... +Source13: https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip#/Keyboard-1.... +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.zi... +Source16: https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip#/Liquid... +Source17: https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip#/Ad... +Source18: https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases...

# This patch skips the init process for OSX platforms. -Patch0: arduino-1.8.5-macosx.patch +Patch0: arduino-1.8.5-macosx.patch # Redirects Arduino to system avr-gcc and avrdude utilities -Patch2: arduino-1.8.3-use-system-avrdude.patch -Patch3: arduino-add-to-groups.patch -Patch4: arduino-1.8.3-script.patch +Patch2: arduino-1.8.3-use-system-avrdude.patch +Patch3: arduino-add-to-groups.patch +Patch4: arduino-1.8.3-script.patch # Redirects Arduino to system astyle libraries -Patch5: arduino-1.8.3-use-system-astyle.patch +Patch5: arduino-1.8.3-use-system-astyle.patch # Allows Arduino to build on non-intel systems -Patch6: arduino-1.8.3-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 +Patch7: arduino-1.8.3-use-system-libserialport.patch + +BuildRequires: java-1.8.0-openjdk-devel +BuildRequires: jpackage-utils ant ant-apache-regexp desktop-file-utils ecj jna +BuildRequires: jmdns jsemver apache-commons-net apache-commons-codec git +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 batik xml-commons-apis xmlgraphics-commons +BuildRequires: libappstream-glib + +Requires: java-1.8.0-openjdk +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 libserialport +Requires: rsyntaxtextarea batik xml-commons-apis xmlgraphics-commons +Requires: %{name}-core = %{version}-%{release} +Requires: arduino-listSerialPortsC + +# require arduino-builder, which is a go project and won't exist outside these arches +ExclusiveArch: %{go_arches} +Requires: arduino-builder >= 1.3.25 + +BuildArch: noarch

%description Arduino is an open-source electronics prototyping platform based on @@ -81,8 +82,8 @@ This package contains an IDE that can be used to develop and upload code to the micro-controller.

%package -n %{name}-core -Summary: Files required for compiling code for Arduino-compatible micro-controllers -Requires: avr-gcc avr-gcc-c++ avr-libc avrdude +Summary: Files required for compiling code for Arduino-compatible micro-controllers +Requires: avr-gcc avr-gcc-c++ avr-libc avrdude

%description -n %{name}-core @@ -96,8 +97,8 @@ Arduino code.

%package -n %{name}-doc -Summary: Documentation for the Arduino micro-controller platform -Requires: avr-gcc avr-gcc-c++ avr-libc avrdude +Summary: Documentation for the Arduino micro-controller platform +Requires: avr-gcc avr-gcc-c++ avr-libc avrdude

%description -n %{name}-doc @@ -152,8 +153,8 @@ find -name '*.jar' -delete find -name '*.so' -delete

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" \ - "\nupdate.check=false" \ + "\n# https://bugzilla.redhat.com/show_bug.cgi?id=773519" \ + "\nupdate.check=false" \ >> build/shared/lib/preferences.txt

build-jar-repository -p -s arduino-core/lib/ apache-commons-codec \ @@ -229,9 +230,9 @@ cp -a ../linux/dist/mime.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{appstrea for dir in ../shared/icons/*; do if [ -d $dir ] then - size=`basename $dir` - mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps - cp $dir/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/%{appstream_id}.png + size=`basename $dir` + mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps + cp $dir/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/%{appstream_id}.png fi done

commit a4975f171202550f5116ebcf4af0fa5947a71511 Author: ElXreno elxreno@gmail.com Date: Tue Apr 7 10:53:51 2020 +0300

Set proper java package

diff --git a/arduino.spec b/arduino.spec index 5fc3a39..125ab3a 100644 --- a/arduino.spec +++ b/arduino.spec @@ -1,7 +1,7 @@ Name: arduino Epoch: 1 Version: 1.8.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An IDE for Arduino-compatible electronics prototyping platforms License: GPLv2+ and LGPLv2+ and CC-BY-SA URL: http://www.arduino.cc/ @@ -33,7 +33,7 @@ Source18: https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/

BuildArch: noarch

-BuildRequires: java-devel = 1:1.8.0 +BuildRequires: java-1.8.0-openjdk-devel BuildRequires: jpackage-utils ant ant-apache-regexp desktop-file-utils ecj jna BuildRequires: jmdns jsemver apache-commons-net apache-commons-codec git BuildRequires: apache-commons-compress apache-commons-exec apache-commons-lang3 @@ -42,7 +42,7 @@ BuildRequires: bouncycastle-pg jackson-databind jackson-module-mrbean BuildRequires: jakarta-commons-httpclient objectweb-asm BuildRequires: rsyntaxtextarea batik xml-commons-apis xmlgraphics-commons BuildRequires: libappstream-glib -Requires: java = 1:1.8.0 +Requires: java-1.8.0-openjdk 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 @@ -286,6 +286,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/*.app %{_datadir}/%{name}/arduino-builder

%changelog +* Tue Apr 07 2020 ElXreno elxreno@gmail.com - 1:1.8.5-10 +- Set proper java package + * Tue Jan 28 2020 Fedora Release Engineering releng@fedoraproject.org - 1:1.8.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild