[arduino] - Treat boards.txt and programmers.txt as config files (#726135). - Make building with "fedpkg local

[mavit]

commit 4b02d33893b32cbd38051dab5ee125d94d8d171d
Author: Peter Oliver <git at mavit.org.uk>
Date:   Mon Sep 12 22:24:01 2011 +0100

    - Treat boards.txt and programmers.txt as config files (#726135).
    - Make building with "fedpkg local" work.

 arduino.spec |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/arduino.spec b/arduino.spec
index 92cd1b0..5a50227 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,6 +1,6 @@
 Name:		arduino
 Version:	0022
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An IDE for Arduino-compatible electronics prototyping platforms
 Group:		Development/Tools
 License:	GPLv2+ and LGPLv2+ and CC-BY-SA
@@ -85,8 +85,13 @@ chmod a+rx build/linux/%{name}-add-groups
 %patch0
 %patch2
 %patch3 -p1
-git apply -v %{PATCH4} >> /tmp/out
-git apply --summary %{PATCH4} >> /tmp/out
+
+# "git apply" fails silently if pwd is git-controlled.
+pwd=`pwd`
+cd /
+git apply --directory=$pwd %{PATCH4}
+cd $pwd
+
 %patch5
 build-jar-repository -p -s app/lib/ ecj jna RXTXcomm
 
@@ -121,6 +126,15 @@ find $RPM_BUILD_ROOT -type f -iname *.jpg -or -iname *.java -or -iname *.pde -or
 
 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/%{_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
+
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 cp -p ../linux/%{name}.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 
@@ -138,7 +152,6 @@ 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
 
@@ -159,6 +172,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -n %{name}-core
 %defattr(-,root,root,-)
 %doc license.txt readme.txt todo.txt
+%config(noreplace) %{_sysconfdir}/%{name}/boards.txt
+%config(noreplace) %{_sysconfdir}/%{name}/programmers.txt
 %{_datadir}/%{name}/examples/
 %{_datadir}/%{name}/hardware/
 %{_datadir}/%{name}/libraries/
@@ -170,6 +185,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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.
+
 * Fri Jul 15 2011 Peter Oliver <rpm at mavit.org.uk> - 0022-4
 - Include missing examples (#722351).