Fri Jun 11 12:26:01 UTC 2010

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29270

Modified Files:
	.cvsignore audacious.spec sources 
Added Files:
	audacious-2.4-doc-enqueue.patch audacious-2.4-libm.patch 
Removed Files:
	audacious-2.2-AUD-99.patch audacious-2.2-coverart-2.patch 
	audacious-2.2-disabled-iplugins.patch 
	audacious-2.2-doc-enqueue.patch audacious-2.2-libm.patch 
	audacious-2.2-multiple-decoders-per-ext.patch 
	audacious-2.2-pkgconfig-libs.patch 
	audacious-2.2-set_tuple_cb.patch 
	audacious-2.2-unescape-fileinfo.patch 
Log Message:
* Wed Jun  9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.1.alpha1
- Drop obsolete BR libsamplerate-devel and --enable-samplerate.
- Upgrade to 2.4 alpha1.


audacious-2.4-doc-enqueue.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-2.4-doc-enqueue.patch ---
diff -Nur audacious-2.2-orig/src/audacious/main.c audacious-2.2/src/audacious/main.c
--- audacious-2.2-orig/src/audacious/main.c	2009-11-22 23:43:47.000000000 +0100
+++ audacious-2.2/src/audacious/main.c	2010-04-16 12:43:53.000000000 +0200
@@ -165,7 +165,7 @@
     {"play-pause", 't', 0, G_OPTION_ARG_NONE, &options.play_pause, N_("Pause if playing, play otherwise"), NULL},
     {"fwd", 'f', 0, G_OPTION_ARG_NONE, &options.fwd, N_("Skip forward in playlist"), NULL},
     {"show-jump-box", 'j', 0, G_OPTION_ARG_NONE, &options.show_jump_box, N_("Display Jump to File dialog"), NULL},
-    {"enqueue", 'e', 0, G_OPTION_ARG_NONE, &options.enqueue, N_("Don't clear the playlist"), NULL},
+    {"enqueue", 'e', 0, G_OPTION_ARG_NONE, &options.enqueue, N_("Add files to the playlist"), NULL},
     {"enqueue-to-temp", 'E', 0, G_OPTION_ARG_NONE, &options.enqueue_to_temp, N_("Add new files to a temporary playlist"), NULL},
     {"show-main-window", 'm', 0, G_OPTION_ARG_NONE, &options.mainwin, N_("Display the main window"), NULL},
     {"activate", 'a', 0, G_OPTION_ARG_NONE, &options.activate, N_("Display all open Audacious windows"), NULL},

audacious-2.4-libm.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-2.4-libm.patch ---
diff -Nur audacious-2.4-alpha1-orig/src/audacious/Makefile audacious-2.4-alpha1/src/audacious/Makefile
--- audacious-2.4-alpha1-orig/src/audacious/Makefile	2010-06-08 17:35:27.000000000 +0200
+++ audacious-2.4-alpha1/src/audacious/Makefile	2010-06-09 20:44:53.000000000 +0200
@@ -124,7 +124,7 @@
 		-I../libaudcore			\
 		-I../libaudtag
 
-LIBS += ${LDADD}						\
+LIBS += ${LDADD}	-lm					\
 		-L../libaudcore -laudcore	\
 		-L../libaudgui -laudgui \
 		-L../libaudtag -laudtag		\


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	25 Nov 2009 14:40:44 -0000	1.18
+++ .cvsignore	11 Jun 2010 12:26:00 -0000	1.19
@@ -1 +1 @@
-audacious-2.2.tgz
+audacious-2.4-alpha1.tgz


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- audacious.spec	11 Jun 2010 09:13:25 -0000	1.78
+++ audacious.spec	11 Jun 2010 12:26:01 -0000	1.79
@@ -1,40 +1,23 @@
 # Minimum audacious/audacious-plugins version in inter-package
 # dependencies.
-# We enforce 2.2 as 2.1 or older is insufficient.
-%define aud_ver 2.2
+# We enforce 2.4 as 2.2 or older is insufficient.
+%define aud_ver 2.4
 
 Name: audacious
-Version: 2.2
-Release: 16%{?dist}
+Version: 2.4
+Release: 0.1.alpha1%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
 URL: http://audacious-media-player.org/
 Group: Applications/Multimedia
 
-Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
+Source0: http://distfiles.atheme.org/audacious-%{version}-alpha1.tgz
 
-# not submitted upstream, code section is gone in post-2.2
-Patch0: audacious-2.2-disabled-iplugins.patch
-# obsolete with version upgrade
-Patch1: audacious-2.2-AUD-99.patch
-# obsolete with version upgrade
-Patch2: audacious-2.2-pkgconfig-libs.patch
-# won't apply with version upgrade
-# for a problem that is known upstream, but 2.3-alpha1 doesn't fixed it yet
-# iplugin sorting order is important, too
-Patch3: audacious-2.2-multiple-decoders-per-ext.patch
-# tuple.c part merged upstream
-Patch4: audacious-2.2-set_tuple_cb.patch
 # merged upstream
-Patch5: audacious-2.2-libm.patch
-# obsolete with version upgrade
-Patch6: audacious-2.2-coverart-2.patch
-# obsolete with version upgrade
-Patch7: audacious-2.2-unescape-fileinfo.patch
-# fix for manual merged upstream
-# fix for --help not merged yet
-Patch8: audacious-2.2-doc-enqueue.patch
+Patch0: audacious-2.4-libm.patch
+# only for --help
+Patch1: audacious-2.4-doc-enqueue.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,9 +31,6 @@ BuildRequires: dbus-devel dbus-glib-deve
 BuildRequires: libSM-devel
 BuildRequires: desktop-file-utils
 
-# disabled by default
-BuildRequires: libsamplerate-devel
-
 # The automatic SONAME dependency is not enough
 # during version upgrades.
 Requires: audacious-libs = %{version}-%{release}
@@ -90,18 +70,11 @@ Files needed when building software for 
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-alpha1
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 sed -i -e 's!\(build_stamp.*\)UNSUPPORTED VERSION!\1Fedora package!' src/audacious/Makefile ; grep 'Fedora package' src/audacious/Makefile || exit -1
-%patch0 -p1 -b .disabled-iplugins
-%patch1 -p1 -b .AUD-99
-%patch2 -p1 -b .pkgconfig-libs
-%patch3 -p1 -b .multiple-decoders
-%patch4 -p1 -b .set_tuple_cb
-%patch5 -p1 -b .libm
-%patch6 -p1 -b .coverart
-%patch7 -p1 -b .unescape-fileinfo
-%patch8 -p1 -b .doc-enqueue
+%patch0 -p1 -b .libm
+%patch1 -p1 -b .doc-enqueue
 
 # From .desktop files remove MIME types the base build of the
 # Fedora audacious-plugins package does not understand.
@@ -127,7 +100,6 @@ done   
 
 %build
 %configure  \
-    --enable-samplerate \
     --disable-sse2  \
     --disable-rpath \
     --disable-dependency-tracking
@@ -155,17 +127,6 @@ desktop-file-install  \
     --add-category AudioVideo  \
     $RPM_BUILD_ROOT%{_datadir}/applications/audacious2.desktop
 
-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
-
-# fixed post-2.3
-# fix for: tarball installs softlinks that point into buildroot
-cd $RPM_BUILD_ROOT%{_bindir}
-rm -f audacious audtool
-ln -s audacious2 audacious
-ln -s audtool2 audtool
-cd -
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -173,17 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -200,7 +153,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/audacious/
 %{_mandir}/man[^3]/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/pixmaps/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -211,13 +164,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_includedir}/audacious/
 %{_includedir}/libaudcore/
 %{_includedir}/libaudgui/
-%{_includedir}/libaudtag/
-%{_includedir}/libSAD/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Wed Jun  9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.1.alpha1
+- Drop obsolete BR libsamplerate-devel and --enable-samplerate.
+- Upgrade to 2.4 alpha1.
+
 * Wed Jun  9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-16
 - Enhance the coverart patch to not crash in URI conversion (#602113).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	25 Nov 2009 14:40:44 -0000	1.18
+++ sources	11 Jun 2010 12:26:01 -0000	1.19
@@ -1 +1 @@
-ad0f7484692c529acfa91ce784170478  audacious-2.2.tgz
+d76f6ec0216cac67d371bec6a6fbe423  audacious-2.4-alpha1.tgz


--- audacious-2.2-AUD-99.patch DELETED ---


--- audacious-2.2-coverart-2.patch DELETED ---


--- audacious-2.2-disabled-iplugins.patch DELETED ---


--- audacious-2.2-doc-enqueue.patch DELETED ---


--- audacious-2.2-libm.patch DELETED ---


--- audacious-2.2-multiple-decoders-per-ext.patch DELETED ---


--- audacious-2.2-pkgconfig-libs.patch DELETED ---


--- audacious-2.2-set_tuple_cb.patch DELETED ---


--- audacious-2.2-unescape-fileinfo.patch DELETED ---

