rpms/audacious/F-10 audacious-1.5.1-desktop-name.patch, NONE, 1.1 audacious-1.5.1-playlist-length.patch, NONE, 1.1 audacious-1.5.1-playlist-play-clicked.patch, NONE, 1.1 audacious.spec, 1.42, 1.43

Fri Jun 5 11:15:15 UTC 2009

Author: mschwendt

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

Modified Files:
	audacious.spec 
Added Files:
	audacious-1.5.1-desktop-name.patch 
	audacious-1.5.1-playlist-length.patch 
	audacious-1.5.1-playlist-play-clicked.patch 
Log Message:
sync with devel

audacious-1.5.1-desktop-name.patch:

--- NEW FILE audacious-1.5.1-desktop-name.patch ---
diff -Nur audacious-1.5.1-orig/configure audacious-1.5.1/configure
--- audacious-1.5.1-orig/configure	2008-05-24 00:00:38.000000000 +0200
+++ audacious-1.5.1/configure	2009-06-04 19:59:54.000000000 +0200
@@ -12651,7 +12651,7 @@
 ### ---------------------------------------------------------------------------
 
   EXP_VAR=desktop_file
-  FROM_VAR="${datadir}/applications/audacious.desktop"
+  FROM_VAR="${datadir}/applications/fedora-audacious.desktop"
 
     prefix_save=$prefix
   exec_prefix_save=$exec_prefix

audacious-1.5.1-playlist-length.patch:

--- NEW FILE audacious-1.5.1-playlist-length.patch ---
diff -uNr audacious-1.5.1-orig/src/audacious/playlist.c audacious-1.5.1/src/audacious/playlist.c
--- audacious-1.5.1-orig/src/audacious/playlist.c	2008-05-24 00:00:34.000000000 +0200
+++ audacious-1.5.1/src/audacious/playlist.c	2009-05-01 19:29:17.663254934 +0200
@@ -1531,6 +1531,9 @@
 gint
 playlist_get_length(Playlist *playlist)
 {
+
+    g_return_val_if_fail(playlist != NULL, 0);
+
     return g_list_length(playlist->entries);
 }
 

audacious-1.5.1-playlist-play-clicked.patch:

--- NEW FILE audacious-1.5.1-playlist-play-clicked.patch ---
--- a/src/audacious/main.c	Sun May 25 15:12:17 2008 +0200
+++ b/src/audacious/main.c	Thu May 29 01:03:13 2008 +0300
@@ -315,7 +315,7 @@ parse_cmd_line_options(gint *argc, gchar
 }
 
 static void
-handle_cmd_line_options()
+handle_cmd_line_options(gboolean skip)
 {
     gchar **filenames = options.filenames;
 #ifdef USE_DBUS
@@ -430,7 +430,7 @@ handle_cmd_line_options()
     } /* is_running */
     else
 #endif
-    { /* !is_running */
+    if (!skip) { /* !is_running */
         if (filenames != NULL)
         {
             gint pos = 0;
@@ -715,7 +715,7 @@ main(gint argc, gchar ** argv)
 
     signal_handlers_init();
 
-    handle_cmd_line_options();
+    handle_cmd_line_options(TRUE);
 
     if (options.headless == FALSE)
     {
@@ -734,6 +734,8 @@ main(gint argc, gchar ** argv)
 
     plugin_system_init();
     playlist_system_init();
+
+    handle_cmd_line_options(FALSE);
 
 #ifdef USE_DBUS
     init_dbus();







Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-10/audacious.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- audacious.spec	27 Nov 2008 11:50:43 -0000	1.42
+++ audacious.spec	5 Jun 2009 11:14:45 -0000	1.43
@@ -1,9 +1,11 @@
-%define         aud_ver 1.5.0
+# Minimum audacious/audacious-plugins version in inter-package
+# dependencies. We have 1.5.1 for both, so we enforce 1.5.1.
+%define aud_ver 1.5.1
 
 Name:           audacious
 Version:        1.5.1
-Release:        5%{?dist}
-Summary:        A GTK2 based media player similar to xmms
+Release:        9%{?dist}
+Summary:        GTK2 based media player similar to XMMS
 
 Group:          Applications/Multimedia
 License:        GPLv2
@@ -21,12 +23,14 @@ Patch6:         audacious-1.2.1-shaded-s
 # Patch8:         audacious-1.1.1-playlist-twenty.patch
 Patch9:         audacious-1.4.2-id3tag-close-file.patch
 Patch10:        audacious-1.5.1-libsad-header.patch
+Patch11:        audacious-1.5.1-playlist-length.patch
+Patch12:        audacious-1.5.1-playlist-play-clicked.patch
+Patch13:        audacious-1.5.1-desktop-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
 BuildRequires:  zlib-devel, desktop-file-utils >= 0.9
 BuildRequires:  libglade2-devel >= 2.4
-BuildRequires:  GConf2-devel
 BuildRequires:  gettext
 BuildRequires:  mcs-devel >= 0.7
 BuildRequires:  libmowgli-devel >= 0.4
@@ -34,50 +38,38 @@ BuildRequires:  dbus-devel >= 0.60, dbus
 
 Requires:       audacious-plugins >= %{aud_ver}
 
-Requires(post):   desktop-file-utils >= 0.9
-Requires(postun): desktop-file-utils >= 0.9
-
-Obsoletes:      bmp <= 0.9.7.1
-Provides:       bmp = 0.9.7.1
-
+# last tagged f8-final
 Provides:       audacious-docklet
 Obsoletes:      audacious-docklet < 0.1.1-3
 
+# Skin packages can require this from xmms and all GUI compatible players
+Provides:       xmms-gui
+
 %description
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-BMP.
+Audacious is a media player that currently uses a skinned user interface
+based on Winamp 2.x skins. It is based on ("forked off") BMP.
 
 
 %package        libs
-Summary:        Library files for Audacious
+Summary:        Library files for the Audacious media player
 Group:          System Environment/Libraries
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
 %description    libs
-Library files for Audacious
+Library files for the Audacious media player.
 
 
 %package        devel
-Summary:        Development files for Audacious
+Summary:        Development files for the Audacious media player
 Group:          Development/Libraries
 Requires:       %{name}-libs = %{version}-%{release}
-Requires:       glib2-devel, gtk2-devel >= 2.6, GConf2-devel, libglade2-devel >= 2.4
-Requires:       mcs-devel >= 0.1
-Requires:       libmowgli-devel >= 0.4
+Requires:       glib2-devel, gtk2-devel >= 2.6, libglade2-devel >= 2.4
+Requires:       mcs-devel
+Requires:       libmowgli-devel
 Requires:       pkgconfig
 Requires:       dbus-glib-devel >= 0.60
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-Obsoletes:      bmp-devel <= 0.9.7.1
-Provides:       bmp-devel = 0.9.7.1
-
 %description    devel
-Development files for Audacious
+Files needed when building software for the Audacious media player.
 
 
 %prep
@@ -116,23 +108,30 @@ Development files for Audacious
 # Remove libSAD references from the public headers
 %patch10 -p1 -b libsad-header
 
-perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
+# Fix segfaults if no playlist exists
+%patch11 -p1 -b playlist-length
+
+# When passing a file on the command line, play the file, not the first playlist entry
+%patch12 -p1 -b playlist-play-clicked
+
+# /usr/bin/audacious looks for the fedora-audacious.desktop file
+%patch13 -p1 -b .desktop-name
+
+sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
 %configure \
     --disable-rpath \
-    --enable-gconf \
-    --disable-gnome-vfs \
     --enable-chardet \
     --enable-dbus \
     --disable-sse2 \
     --disable-dependency-tracking
-make V=1 %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %find_lang %{name}
 
 desktop-file-install --vendor fedora \
@@ -157,25 +156,25 @@ mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/au
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 rm -rf $RPM_BUILD_ROOT%{_includedir}/libSAD
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
-update-desktop-database %{_datadir}/applications
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-update-desktop-database %{_datadir}/applications
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
 
 %postun libs -p /sbin/ldconfig
@@ -186,25 +185,46 @@ fi
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/audacious
 %{_bindir}/audtool
-%{_datadir}/audacious
+%{_datadir}/audacious/
 %{_mandir}/man[^3]/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/48x48/apps/*
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/audacious
+%{_libdir}/audacious/
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/audacious
+%{_includedir}/audacious/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
 
 %changelog
-* Thu Nov 27 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-5
+* Fri Jun  5 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-9
+- update post/postun/posttrans scriptlets to match guidelines
+- drop BR GConf2-devel
+- drop obsolete configure options
+- drop ancient Obsoletes/Provides for BMP
+- minor spec updates
+
+* Thu Jun  4 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- Patch /usr/bin/audacious to find fedora-audacious.desktop file.
+
+* Fri May 01 2009 Ralf Ertzinger <ralf at skytale.net> 1.5.1-8
+- Fix for "segfault with no playlist present" (BZ#475691)
+- Fix for broken playlist handling (BZ#475691), patch from
+  http://launchpadlibrarian.net/19179891/audacious_1.5.1-3ubuntu1.1.debdiff
+
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.5.1-7
+- Add "xmms-gui" provides, to be required from xmms-skins package (#470135).
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Nov 17 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-5
 - Disable SSE2
 
 * Mon Oct 13 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-4


