[arduino] * Mon Jan 2 2012 Peter Oliver <rpm at mavit.org.uk> - 1:1.0-1 - Update to 1.0. - Drop arduino-use-syst

[mavit]

commit 4e2acc1bf24d323af4ff90af3e0f2e27843803fe
Author: Peter Oliver <git at mavit.org.uk>
Date:   Mon Jan 2 01:49:17 2012 +0000

    * Mon Jan  2 2012 Peter Oliver <rpm at mavit.org.uk> - 1:1.0-1
    - Update to 1.0.
    - Drop arduino-use-system-avrdude.patch and arduino-boards-txt.patch,
      since they're no-longer needed.
    - Move preferences.txt to /etc.

 .gitignore   |    1 +
 arduino.spec |   33 ++++++++++++++++++++-------------
 sources      |    2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c74dc79..8a6e909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /arduino-0019.tar.bz2
 /arduino-0021.tar.bz2
 /arduino-0022.tar.bz2
+/arduino-1.0.tar.bz2
diff --git a/arduino.spec b/arduino.spec
index 5a50227..afb9459 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,6 +1,8 @@
 Name:		arduino
-Version:	0022
-Release:	5%{?dist}
+Epoch:		1
+Version:	1.0
+%define version_04d 0100
+Release:	1%{?dist}
 Summary:	An IDE for Arduino-compatible electronics prototyping platforms
 Group:		Development/Tools
 License:	GPLv2+ and LGPLv2+ and CC-BY-SA
@@ -16,21 +18,16 @@ BuildArch:	noarch
 
 # Use unbundled libs:
 Patch0:		arduino-script.patch
-Patch2:		arduino-use-system-avrdude.patch
 # Requested upstream in http://github.com/arduino/Arduino/pull/5:
 Patch3:		arduino-use-system-rxtx.patch
 
 # Requested upstream in http://github.com/arduino/Arduino/pull/6:
 Patch4:		arduino-icons-etc.patch
 
-# Shouldn't be necessary once
-# https://code.google.com/p/arduino/issues/detail?id=106 has been fixed:
-Patch5:		arduino-boards-txt.patch
-
 Patch6:		arduino-add-to-groups.patch
 
 BuildRequires:	java-devel >= 1:1.6.0 jpackage-utils ant ant-apache-regexp desktop-file-utils ecj jna rxtx git
-Requires:	%{name}-core = %{version}-%{release}, %{name}-doc = %{version}-%{release}
+Requires:	%{name}-core = %{epoch}:%{version}-%{release}, %{name}-doc = %{epoch}:%{version}-%{release}
 Requires:	java >= 1:1.6.0 xorg-x11-fonts-Type1 ecj jna rxtx
 Requires:	zenity perl polkit
 
@@ -83,7 +80,6 @@ find -name '*.jar' -exec rm -f '{}' \;
 %patch6 -p1
 chmod a+rx build/linux/%{name}-add-groups
 %patch0
-%patch2
 %patch3 -p1
 
 # "git apply" fails silently if pwd is git-controlled.
@@ -92,7 +88,6 @@ cd /
 git apply --directory=$pwd %{PATCH4}
 cd $pwd
 
-%patch5
 build-jar-repository -p -s app/lib/ ecj jna RXTXcomm
 
 
@@ -103,11 +98,11 @@ cd ..
 ant
 cd ../build
 ant dist < /dev/null
-tar -xf linux/%{name}-%{version}.tgz
+tar -xf linux/%{name}-%{version_04d}-linux.tgz
 
 
 %install
-cd build/%{name}-%{version}
+cd build/%{name}-%{version_04d}
 
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 cp -a arduino $RPM_BUILD_ROOT/%{_bindir}/
@@ -129,11 +124,14 @@ cp -a lib/core.jar lib/pde.jar $RPM_BUILD_ROOT/%{_datadir}/%{name}/
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
 mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/hardware/%{name}/boards.txt \
    $RPM_BUILD_ROOT/%{_datadir}/%{name}/hardware/%{name}/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}/boards.txt
 ln -s %{_sysconfdir}/%{name}/programmers.txt \
    $RPM_BUILD_ROOT/%{_datadir}/%{name}/hardware/%{name}/programmers.txt
+ln -s %{_sysconfdir}/%{name}/preferences.txt \
+   $RPM_BUILD_ROOT/%{_datadir}/%{name}/lib/preferences.txt
 
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 cp -p ../linux/%{name}.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
@@ -152,6 +150,7 @@ cp -a ../linux/%{name}-add-groups $RPM_BUILD_ROOT/%{_libexecdir}/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions
 cp -a ../linux/cc.arduino.add-groups.policy $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -174,6 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc license.txt readme.txt todo.txt
 %config(noreplace) %{_sysconfdir}/%{name}/boards.txt
 %config(noreplace) %{_sysconfdir}/%{name}/programmers.txt
+%config(noreplace) %{_sysconfdir}/%{name}/preferences.txt
 %{_datadir}/%{name}/examples/
 %{_datadir}/%{name}/hardware/
 %{_datadir}/%{name}/libraries/
@@ -185,6 +185,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan  2 2012 Peter Oliver <rpm at mavit.org.uk> - 1:1.0-1
+- Update to 1.0.
+- Drop arduino-use-system-avrdude.patch and arduino-boards-txt.patch,
+  since they're no-longer needed.
+- Move preferences.txt to /etc.
+
 * Mon Sep 12 2011 Peter Oliver <rpm at mavit.org.uk> - 0022-5
 - Treat boards.txt and programmers.txt as config files (#726135).
 - Make building with "fedpkg local" work.
@@ -196,7 +202,8 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Fri Dec 31 2010 Peter Oliver <rpm at mavit.org.uk> - 0022-2
-- Prompt the user if they are not a member of the required groups, rather than failing silently.
+- Prompt the user if they are not a member of the required groups,
+  rather than failing silently.
 
 * Thu Dec 30 2010 Peter Oliver <rpm at mavit.org.uk> - 0022-1
 - Update to 0022 release (#666309).
diff --git a/sources b/sources
index 4aa3ef1..775b604 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57341611de807f71da8350c305e2b801  arduino-0022.tar.bz2
+d20131452cca6b02e5fe36af6a3b99bb  arduino-1.0.tar.bz2