rpms/audacious/F-8 audacious-1.4.0-default-skin.patch, NONE, 1.1 audacious-1.4.2-id3tag-close-file.patch, NONE, 1.1 audacious.spec, 1.25, 1.26

[Ralf Ertzinger (ertzing)]

Author: ertzing

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

Modified Files:
	audacious.spec 
Added Files:
	audacious-1.4.0-default-skin.patch 
	audacious-1.4.2-id3tag-close-file.patch 
Log Message:
* Mon Dec 21 2007 Ralf Ertzinger <ralf at skytale.net> 1.4.4-1
- Update to 1.4.4


audacious-1.4.0-default-skin.patch:

--- NEW FILE audacious-1.4.0-default-skin.patch ---
diff -uNr audacious-1.4.0-hg3897-orig/src/audacious/main.c audacious-1.4.0-hg3897/src/audacious/main.c
--- audacious-1.4.0-hg3897-orig/src/audacious/main.c	2007-11-04 13:31:15.000000000 +0100
+++ audacious-1.4.0-hg3897/src/audacious/main.c	2007-11-04 15:37:39.000000000 +0100
@@ -166,7 +166,7 @@
     0.0,                        /* equalizer preamp */
     {0.0, 0.0, 0.0, 0.0, 0.0,             /* equalizer bands */
      0.0, 0.0, 0.0, 0.0, 0.0},
-    NULL,                       /* skin */
+    "/usr/share/xmms/Skins/Bluecurve-xmms.zip", /* skin */
     NULL,                       /* output plugin */
     NULL,                       /* file selector path */
     NULL,                       /* playlist path */

audacious-1.4.2-id3tag-close-file.patch:

--- NEW FILE audacious-1.4.2-id3tag-close-file.patch ---
diff -r 8a260b322dc9 -r 20736bb2e7f6 src/libid3tag/file.c
--- a/src/libid3tag/file.c	Wed Nov 28 06:02:59 2007 +0900
+++ b/src/libid3tag/file.c	Wed Nov 28 16:55:02 2007 +0100
@@ -494,6 +494,7 @@ struct id3_file *id3_file_vfsopen(VFSFil
   file = new_file(iofile, mode, path);
   if (file == 0){
     printf("id3_file_vfsopen: file failed\n");
+    aud_vfs_fclose(iofile);
   }
 
   aud_vfs_fseek(iofile, curpos, SEEK_SET);


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/F-8/audacious.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- audacious.spec	29 Aug 2007 04:05:33 -0000	1.25
+++ audacious.spec	21 Dec 2007 13:35:45 -0000	1.26
@@ -1,6 +1,8 @@
+%define         aud_ver 1.4.0
+
 Name:           audacious
-Version:        1.3.2
-Release:        3%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -9,7 +11,7 @@
 
 Source0:        http://static.audacious-media-player.org/release/audacious-%{version}.tgz
 Patch0:         audacious-1.3.1-xmms-skins.patch
-Patch1:         audacious-1.3.1-default-skin.patch
+Patch1:         audacious-1.4.0-default-skin.patch
 # Patch2:         audacious-1.1.0-no-rpath.patch
 Patch3:         audacious-1.2.1-relative-links.patch
 # Patch4:         audacious-1.1.0-quoting.patch
@@ -17,6 +19,7 @@
 Patch6:         audacious-1.2.1-shaded-skin.patch
 # Patch7:         audacious-1.1.1-controlsocket-name.patch
 # Patch8:         audacious-1.1.1-playlist-twenty.patch
+Patch9:         audacious-1.4.2-id3tag-close-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -25,8 +28,10 @@
 BuildRequires:  GConf2-devel
 BuildRequires:  gettext
 BuildRequires:  mcs-devel >= 0.1
+BuildRequires:  libmowgli-devel >= 0.4
+BuildRequires:  dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 
-Requires:       audacious-plugins >= 1.3.0
+Requires:       audacious-plugins >= %{aud_ver}
 
 Requires(post):   desktop-file-utils >= 0.9
 Requires(postun): desktop-file-utils >= 0.9
@@ -34,6 +39,9 @@
 Obsoletes:      bmp <= 0.9.7.1
 Provides:       bmp = 0.9.7.1
 
+Provides:       audacious-docklet
+Obsoletes:      audacious-docklet < 0.1.1-3
+
 %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")
@@ -44,6 +52,9 @@
 Summary:        Library files for Audacious
 Group:          System Environment/Libraries
 
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 %description    libs
 Library files for Audacious
 
@@ -54,6 +65,7 @@
 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:       pkgconfig
 
 Requires(post):   /sbin/ldconfig
@@ -96,12 +108,18 @@
 # Fix "%20" in playlist entries
 # %patch8 -p1 -b playlist-twenty
 
+# Fix files left open on non-seekable mp3 streams
+%patch9 -p1 -b id3tag-close-file
+
+perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
+
 %build
 %configure \
     --disable-rpath \
     --enable-gconf \
     --disable-gnome-vfs \
     --enable-chardet \
+    --enable-dbus \
     --disable-dependency-tracking
 make V=1 %{?_smp_mflags}
 
@@ -157,7 +175,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/audacious
 %{_bindir}/audtool
 %{_datadir}/audacious
@@ -178,6 +196,9 @@
 
 
 %changelog
+* Mon Dec 21 2007 Ralf Ertzinger <ralf at skytale.net> 1.4.4-1
+- Update to 1.4.4
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.2-3
 - Rebuild for selinux ppc32 issue.