diff --git a/arduino.spec b/arduino.spec index a8d58da..d40e0df 100644 --- a/arduino.spec +++ b/arduino.spec @@ -2,14 +2,14 @@ %define longversion %(echo 0%version | tr -d .) Name: arduino -Version: 1.8.13 +Version: 1.8.15 Release: 1mamba Summary: The open-source Arduino environment Group: Graphical Desktop/Applications/Development Vendor: openmamba Distribution: openmamba -Packager: Stefano Cotta Ramusino -URL: http://www.arduino.cc/en/Main/software +Packager: Silvan Calarco +URL: https://www.arduino.cc/en/software/ Source: https://github.com/arduino/Arduino.git/%{version}/Arduino-%{version}.tar.bz2 Source1: arduino-1.0.1-icons.tar.xz Patch0: arduino-1.0.1-script.patch @@ -19,17 +19,18 @@ Patch1: arduino-1.0-use_system_rxtx.patch Patch2: arduino-1.0-etc.patch License: GPL ## AUTOBUILDREQ-BEGIN -BuildRequires: java-rxtx -BuildRequires: ldconfig +BuildRequires: glibc-devel +BuildRequires: libgcc +BuildRequires: libstdc++6-devel ## AUTOBUILDREQ-END BuildRequires: apache-ant -BuildRequires: jpackage-utils +BuildRequires: javapackages +Requires: java-openjdk8-runtime Requires: cross-avr-gcc Requires: avr-libc Requires: avrdude Requires: java-rxtx -Obsoletes: arduino.noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: arduino.noarch < 1.8.15 %description The open-source Arduino environment makes it easy to write code and upload it to the Arduino i/o board. @@ -52,6 +53,7 @@ tar xf %{SOURCE1} #build-jar-repository -p -s app/lib/ ecj jna RXTXcomm %build +export JAVA_HOME=%{_jvmdir}/java-8 %ifarch x86_64 export platform=linux64 %endif @@ -65,20 +67,10 @@ export LD_PRELOAD=/usr/lib/libatomic.so cd build -count=0 -set +e -while [[ count -lt 5 ]]; do -# Workaround for java random crashes on build servers -count=$((count+1)) -#(cd core/methods; ant) -#(cd core; ant) ant -Djava.net.preferIPv4Stack=true -Dplatform=${platform} dist << __END __END -[ $? -eq 0 ] && break -done -[ $? -ne 0 ] && exit 1 -set -e + tar -xf linux/arduino-%{version}-${platform}.tar.xz %install @@ -128,6 +120,9 @@ done %doc %{_defaultdocdir}/arduino-%{version}/reference %changelog +* Wed May 19 2021 Automatic Build System 1.8.15-1mamba +- automatic version update by autodist + * Sat Jul 11 2020 Automatic Build System 1.8.13-1mamba - automatic version update by autodist