rpms/audacious/F-12 .cvsignore, 1.15, 1.16 audacious.spec, 1.56, 1.57 sources, 1.15, 1.16 README, 1.1, NONE audacious-2.1-mowgli-crash.patch, 1.1, NONE audacious-2.1-output.patch, 1.1, NONE audacious-2.1-pluginprio.patch, 1.1, NONE

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8461

Modified Files:
	.cvsignore audacious.spec sources 
Removed Files:
	README audacious-2.1-mowgli-crash.patch 
	audacious-2.1-output.patch audacious-2.1-pluginprio.patch 
Log Message:
sync with Rawhide for Audacious 2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	14 Jul 2009 17:09:26 -0000	1.15
+++ .cvsignore	30 Dec 2009 15:13:40 -0000	1.16
@@ -1 +1 @@
-audacious-2.1.tgz
+audacious-2.2.tgz


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- audacious.spec	21 Nov 2009 19:57:21 -0000	1.56
+++ audacious.spec	30 Dec 2009 15:13:41 -0000	1.57
@@ -1,11 +1,11 @@
 # Minimum audacious/audacious-plugins version in inter-package
 # dependencies.
-# We enforce 2.1 as 2.0.1 or older is insufficient.
-%define aud_ver 2.1
+# We enforce 2.2 as 2.1 or older is insufficient.
+%define aud_ver 2.2
 
 Name: audacious
-Version: 2.1
-Release: 7%{?dist}
+Version: 2.2
+Release: 2%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -14,13 +14,6 @@ Group: Applications/Multimedia
 
 Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
 
-# will be obsolete in > 2.1
-Patch0: audacious-2.1-pluginprio.patch
-# debug helper and safety measure for #538379
-Patch1: audacious-2.1-mowgli-crash.patch
-# effect/flow crash fix from devel
-Patch2: audacious-2.1-output.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -47,7 +40,9 @@ Provides: xmms-gui
 
 %description
 Audacious is a media player that currently uses a skinned user interface
-based on Winamp 2.x skins.
+(based on Winamp 2.x skins) as well as a separate GTK2 based front end.
+Historically, it started as a fork of Beep Media Player (BMP), which
+itself forked from XMMS.
 
 
 %package libs
@@ -74,11 +69,30 @@ Files needed when building software for 
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .pluginprio
-%patch1 -p1 -b .mowgli-crash
-%patch2 -p1 -b .output
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
+# From .desktop files remove MIME types the base build of the
+# Fedora audacious-plugins package does not understand.
+for t in \
+    audio/mp3 \
+    audio/mpeg \
+    audio/mpegurl \
+    audio/x-mp3 \
+    audio/x-mpeg \
+    audio/x-mpegurl \
+    audio/x-ms-wma \
+    audio/x-musepack \
+    audio/prs.sid \
+; do
+    for f in audacious2.desktop audacious2-gtkui.desktop ; do
+        cp ${f} ${f}.old
+        sed -i "s!${t};!!g" $f
+        diff -u ${f}.old ${f} || :
+        rm -f ${f}.old
+    done
+done   
+
+
 %build
 %configure  \
     --enable-samplerate \
@@ -111,7 +125,7 @@ desktop-file-install  \
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/audacious2.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
-# 2.2-alpha1 will install these compatibility softlinks
+# fix for: tarball installs softlinks that point into buildroot
 cd $RPM_BUILD_ROOT%{_bindir}
 rm -f audacious audtool
 ln -s audacious2 audacious
@@ -162,18 +176,36 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %{_includedir}/audacious/
 %{_includedir}/libaudcore/
+%{_includedir}/libaudgui/
+%{_includedir}/libaudtag/
 %{_includedir}/libSAD/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
-* Sat Nov 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-7
-- Fix effects output (also fixes sndstretch realloc crash).
-
-* Thu Nov 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-6
-- Rebuild with a safety-measure/terminal-debug patch for the
-  mowgli_dictionary_retune crash on x86_64 (#538379).
+* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
+- Drop Musepack and SID MIME types from desktop files. As of Audacious 2.2,
+  Musepack is only supported by the separate "ffaudio" plugin. The SID
+  plugin in a separate subpackage provides its own desktop file.
+- Drop unsupported MIME types from desktop files.
+
+* Wed Nov 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-1
+- Upgrade to 2.2 (declared as the next "stable release" after 2.1).
+
+* Tue Nov 10 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta2
+- Upgrade to 2.2-beta2
+
+* Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
+- Upgrade to 2.2-beta1
+
+* Sun Oct 18 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha2
+- Upgrade to 2.2-alpha2
+
+* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha1
+- Upgrade to 2.2-alpha1 (primarly for alsa-gapless output plugin).
+- /usr/bin/audacious and /usr/bin/audtool compatibility links are now
+  provided officially by upstream.
 
 * Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-5
 - /usr/bin/audacious and /usr/bin/audtool compatibility links are


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	14 Jul 2009 17:09:26 -0000	1.15
+++ sources	30 Dec 2009 15:13:41 -0000	1.16
@@ -1 +1 @@
-03ab6a062e5909214841f90f767f1147  audacious-2.1.tgz
+ad0f7484692c529acfa91ce784170478  audacious-2.2.tgz


--- README DELETED ---


--- audacious-2.1-mowgli-crash.patch DELETED ---


--- audacious-2.1-output.patch DELETED ---


--- audacious-2.1-pluginprio.patch DELETED ---