mavit pushed to arduino (master). "Update to 1.0.6."

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 6 09:42:30 UTC 2015


>From fbfc0616e6e10a95ed4e54c0eb3a393226d9359d Mon Sep 17 00:00:00 2001
From: Peter Oliver <git at mavit.org.uk>
Date: Mon, 6 Apr 2015 10:42:11 +0100
Subject: Update to 1.0.6.


diff --git a/.gitignore b/.gitignore
index 6039b02..4a60573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /arduino-1.0.tar.bz2
 /arduino-1.0.1.tar.xz
 /arduino-1.0.5.tar.xz
+/arduino-1.0.6.tar.xz
diff --git a/arduino-build-platform.patch b/arduino-build-platform.patch
index 6cb6b59..094b8f0 100644
--- a/arduino-build-platform.patch
+++ b/arduino-build-platform.patch
@@ -7,5 +7,5 @@
 -	     value="linux64"><os family="unix" arch="amd64" /></condition>
 +	     value="linux64"><os family="unix" /></condition>
  
-   <!-- Libraries required for running arduino -->
-   <fileset dir=".." id="runtime.jars">
+   <condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
+   <property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
diff --git a/arduino.spec b/arduino.spec
index 16541c3..1e7a9b4 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,14 +1,14 @@
 Name:		arduino
 Epoch:		1
-Version:	1.0.5
-Release:	8%{?dist}
+Version:	1.0.6
+Release:	1%{?dist}
 Summary:	An IDE for Arduino-compatible electronics prototyping platforms
 Group:		Development/Tools
 License:	GPLv2+ and LGPLv2+ and CC-BY-SA
 URL:		http://www.arduino.cc/
 
 # There are lots of binaries in the "source" tarball.  Remove them with:
-# version=1.0.5; curl -L http://arduino.googlecode.com/files/arduino-$version-src.tar.gz | tar -xzf - && rm -r arduino-$version/build/linux/dist/tools/* && rm -r arduino-$version/hardware/arduino/firmwares/wifishield && find arduino-$version \( -type d \( -name macosx -o -name windows \) -o -type f \( -iname '*.jar' -or -iname '*.tgz' -or -iname '*.tar.gz' -or -iname '*.so' \) \) -print0 | xargs -0 rm -rf && tar -cJf arduino-$version.tar.xz arduino-$version
+# version=1.0.6; curl -L https://github.com/arduino/Arduino/archive/$version.tar.gz | tar -xzf - && mv Arduino-$version arduino-$version && rm -r arduino-$version/build/linux/dist/tools/* && rm -r arduino-$version/hardware/arduino/firmwares/wifishield && find arduino-$version \( -type d \( -name macosx -o -name windows \) -o -type f \( -iname '*.jar' -or -iname '*.tgz' -or -iname '*.tar.gz' -or -iname '*.so' \) \) -print0 | xargs -0 rm -rf && tar -cJf arduino-$version.tar.xz arduino-$version
 # See also http://code.google.com/p/arduino/issues/detail?id=193
 Source0:	%{name}-%{version}.tar.xz
 
@@ -133,7 +133,7 @@ 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.txt ../../todo.txt reference $RPM_BUILD_ROOT/%{_pkgdocdir}/
+cp -a ../../license.txt ../../README.md reference $RPM_BUILD_ROOT/%{_pkgdocdir}/
 ln -s %{_pkgdocdir}/reference $RPM_BUILD_ROOT/%{_datadir}/%{name}/reference
 
 # Requested upstream in http://github.com/arduino/Arduino/pull/4:
@@ -219,8 +219,7 @@ fi
 %files -n %{name}-core
 %defattr(-,root,root,-)
 %{_pkgdocdir}/license.txt
-%{_pkgdocdir}/readme.txt 
-%{_pkgdocdir}/todo.txt
+%{_pkgdocdir}/README.md
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/boards.txt
 %config(noreplace) %{_sysconfdir}/%{name}/programmers.txt
@@ -239,6 +238,9 @@ fi
 
 
 %changelog
+* Mon Apr  6 2015 Peter Oliver <rpm at mavit.org.uk> - 1:1.0.6-1
+- Update to 1.0.6.
+
 * Tue Jul 08 2014 Rex Dieter <rdieter at fedoraproject.org> 1:1.0.5-8
 - optimize mimeinfo scriptlet
 
diff --git a/sources b/sources
index 1004872..c9cf933 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b14094dd4c64d55724aecc2cf38b729c  arduino-1.0.5.tar.xz
+7ffb97eda2cc47e7f21490d8e4109558  arduino-1.0.6.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/arduino.git/commit/?h=master&id=fbfc0616e6e10a95ed4e54c0eb3a393226d9359d


More information about the scm-commits mailing list