rpms/ardour/F-8 .cvsignore, 1.3, 1.4 ardour.spec, 1.8, 1.9 sources, 1.3, 1.4

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/ardour/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31022

Modified Files:
	.cvsignore ardour.spec sources 
Log Message:
Upgrade to ardour 2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Oct 2007 11:50:11 -0000	1.3
+++ .cvsignore	28 Jan 2008 11:53:59 -0000	1.4
@@ -1 +1 @@
-ardour-2.1.tar.bz2
+ardour-2.2.tar.bz2


Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-8/ardour.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ardour.spec	21 Dec 2007 18:29:12 -0000	1.8
+++ ardour.spec	28 Jan 2008 11:53:59 -0000	1.9
@@ -1,12 +1,14 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.1
-Release:       4%{?dist}
+Version:       2.2
+Release:       3%{?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
+Patch3:        ardour-2.1-glib215.patch
 URL:           http://ardour.org
 License:       GPLv2+
 Group:         Applications/Multimedia
@@ -49,6 +51,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+# %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
@@ -87,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
@@ -131,6 +139,7 @@
 %defattr(-,root,root,-)
 %doc README COPYING DOCUMENTATION
 %{_bindir}/ardour2
+%{_libexecdir}/ardour2
 %{_libdir}/ardour2/
 %{_datadir}/ardour2/
 %{_datadir}/ardour/
@@ -141,12 +150,25 @@
 %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
-* Mon Dec 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-4
+* Wed Jan 23 2008 Anthony Green <green at redhat.com> 2.2-3
+- Fix tagging glitch.
+
+* Tue Jan 22 2008 Anthony Green <green at redhat.com> 2.2-2
+- Fix wrapper script.
+
+* 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
 
 * Wed Oct 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-3
 - Fix finding of translations (bz 238552)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Oct 2007 11:50:11 -0000	1.3
+++ sources	28 Jan 2008 11:53:59 -0000	1.4
@@ -1 +1 @@
-18be414a37b832aae23c068ba9fcf8ab  ardour-2.1.tar.bz2
+151dcc194dfdba3cd7f61faeed6e06f5  ardour-2.2.tar.bz2