rpms/ardour/devel ardour.script,NONE,1.1 ardour.spec,1.9,1.10

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/ardour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4233

Modified Files:
	ardour.spec 
Added Files:
	ardour.script 
Log Message:
Upgrade to ardour 2.2



--- NEW FILE ardour.script ---
#!/bin/sh

FLAG=~/.ardour2/ardourver2.2

if ! test -a $FLAG; then
   rm -f ~/.ardour2/ardour2_ui.rc
   rm -f ~/.ardour2/ardour2_ui.conf
   rm -f ~/.ardour2/ardour.bindings
   touch $FLAG
fi

exec /usr/libexec/ardour2 "$@"


Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ardour.spec	22 Dec 2007 10:38:47 -0000	1.9
+++ ardour.spec	22 Jan 2008 07:30:45 -0000	1.10
@@ -1,9 +1,10 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.1
-Release:       4%{?dist}
+Version:       2.2
+Release:       1%{?dist}
 Source:        http://ardour.org/files/releases/ardour-%{version}.tar.bz2
 Source1:       ardour2.desktop
+Source2:       ardour.script
 Patch0:        ardour-2.1-SConstruct.patch
 Patch1:        ardour-session.cc-no_stomp.patch
 Patch2:        ardour-session.cc-_total_free_4k_blocks.patch
@@ -50,7 +51,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
-%patch3 -p1
+# %patch3 -p1
 for i in README.fr README.it TRANSLATORS; do
   iconv -f ISO-8859-1 -t UTF8 DOCUMENTATION/$i > DOCUMENTATION/$i.tmp
   mv DOCUMENTATION/$i.tmp DOCUMENTATION/$i
@@ -89,6 +90,11 @@
 mkdir -p $RPM_BUILD_ROOT
 scons DESTDIR=$RPM_BUILD_ROOT install
 
+# Replace ardour2 with a script
+install -dm 755 $RPM_BUILD_ROOT%{_libexecdir}
+mv $RPM_BUILD_ROOT%{_bindir}/ardour2 $RPM_BUILD_ROOT%{_libexecdir}
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ardour2
+
 # install the templates
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
 cp templates/*.template $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
@@ -133,6 +139,7 @@
 %defattr(-,root,root,-)
 %doc README COPYING DOCUMENTATION
 %{_bindir}/ardour2
+%{_libexecdir}/ardour2
 %{_libdir}/ardour2/
 %{_datadir}/ardour2/
 %{_datadir}/ardour/
@@ -143,10 +150,16 @@
 %config(noreplace) %{_sysconfdir}/ardour2/ardour2_ui_light.rc
 %config(noreplace) %{_sysconfdir}/ardour2/ardour.bindings
 %config(noreplace) %{_sysconfdir}/ardour2/ardour.menus
+%config(noreplace) %{_sysconfdir}/ardour2/ardour-sae.menus
+%config(noreplace) %{_sysconfdir}/ardour2/ardour-sae-ansi.bindings
+%config(noreplace) %{_sysconfdir}/ardour2/ardour-sae-de.bindings
 %{_datadir}/icons/hicolor/*/apps/ardour.png
 %{_datadir}/applications/fedora-ardour2.desktop
 
 %changelog
+* Thu Jan 17 2008 Anthony Green <green at redhat.com> 2.2-1
+- Upgrade to ardour 2.2.  Wrap executable in a script.
+
 * Fri Dec 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-4
 - Fix building of ardour on alpha machines (bz 425987)
 - Fix building with glib-2.15.0