rpms/audacious/FC-6 audacious-1.3.1-default-skin.patch, NONE, 1.1 audacious-1.3.1-xmms-skins.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 audacious.spec, 1.16, 1.17 sources, 1.6, 1.7 audacious-1.1.0-default-skin.patch, 1.1, NONE audacious-1.1.0-xmms-skins.patch, 1.1, NONE

[Ralf Ertzinger (ertzing)]

Author: ertzing

Update of /cvs/extras/rpms/audacious/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7854

Modified Files:
	.cvsignore audacious.spec sources 
Added Files:
	audacious-1.3.1-default-skin.patch 
	audacious-1.3.1-xmms-skins.patch 
Removed Files:
	audacious-1.1.0-default-skin.patch 
	audacious-1.1.0-xmms-skins.patch 
Log Message:

- Update to 1.3.2


audacious-1.3.1-default-skin.patch:

--- NEW FILE audacious-1.3.1-default-skin.patch ---
diff -Nurip audacious-1.3.1-orig/src/audacious/main.c audacious-1.3.1/src/audacious/main.c
--- audacious-1.3.1-orig/src/audacious/main.c	2007-03-04 07:34:27.000000000 +0100
+++ audacious-1.3.1/src/audacious/main.c	2007-03-14 21:03:25.000000000 +0100
@@ -159,7 +159,7 @@ BmpConfig bmp_default_config = {
     0.0,                        /* equalizer preamp */
     {0, 0, 0, 0, 0,             /* equalizer bands */
      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.3.1-xmms-skins.patch:

--- NEW FILE audacious-1.3.1-xmms-skins.patch ---
diff -Nurip audacious-1.3.1-orig/src/audacious/ui_skinselector.c audacious-1.3.1/src/audacious/ui_skinselector.c
--- audacious-1.3.1-orig/src/audacious/ui_skinselector.c	2007-01-13 18:19:52.000000000 +0100
+++ audacious-1.3.1/src/audacious/ui_skinselector.c	2007-03-14 20:58:59.000000000 +0100
@@ -249,11 +249,15 @@ void
 skinlist_update(void)
 {
     gchar *skinsdir;
+    gchar xmmsskinsdir[] = "/usr/share/xmms/Skins";
 
     skinlist_clear();
 
     scan_skindir(bmp_paths[BMP_PATH_USER_SKIN_DIR]);
     scan_skindir(DATA_DIR G_DIR_SEPARATOR_S "Skins");
+    if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
+        scan_skindir( xmmsskinsdir );
+    }
 
     skinsdir = getenv("SKINSDIR");
     if (skinsdir) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Dec 2006 16:40:58 -0000	1.6
+++ .cvsignore	16 Apr 2007 11:24:08 -0000	1.7
@@ -1 +1 @@
-audacious-1.2.2.tgz
+audacious-1.3.2.tgz


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/FC-6/audacious.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audacious.spec	24 Dec 2006 14:21:45 -0000	1.16
+++ audacious.spec	16 Apr 2007 11:24:08 -0000	1.17
@@ -1,15 +1,15 @@
 Name:           audacious
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://audacious-media-player.org/
 
-Source0:        audacious-%{version}.tgz
-Patch0:         audacious-1.1.0-xmms-skins.patch
-Patch1:         audacious-1.1.0-default-skin.patch
+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
 # Patch2:         audacious-1.1.0-no-rpath.patch
 Patch3:         audacious-1.2.1-relative-links.patch
 # Patch4:         audacious-1.1.0-quoting.patch
@@ -24,8 +24,9 @@
 BuildRequires:  libglade2-devel >= 2.4
 BuildRequires:  GConf2-devel
 BuildRequires:  gettext
+BuildRequires:  mcs-devel >= 0.1
 
-Requires:       audacious-plugins >= 1.2.0
+Requires:       audacious-plugins >= 1.3.0
 
 Requires(post):   desktop-file-utils >= 0.9
 Requires(postun): desktop-file-utils >= 0.9
@@ -52,6 +53,7 @@
 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:       pkgconfig
 
 Requires(post):   /sbin/ldconfig
@@ -77,7 +79,7 @@
 # %patch2 -p1 -b .no-rpath
 
 # Relative symlink paths
-%patch3 -p1 -b .relative-links
+# %patch3 -p1 -b .relative-links
 
 # Filename quoting
 # %patch4 -p1 -b .quoting
@@ -86,7 +88,7 @@
 # %patch5 -p1 -b .amidi-backend
 
 # Shaded playlist window decorations
-%patch6 -p1 -b shaded-skin
+# %patch6 -p1 -b .shaded-skin
 
 # Controlsocket named "xmms" instead of "audacious"
 # %patch7 -p1 -b controlsocket-name
@@ -165,6 +167,7 @@
 
 %files libs
 %defattr(-,root,root,-)
+%{_libdir}/audacious
 %{_libdir}/*.so.*
 
 %files devel
@@ -175,6 +178,9 @@
 
 
 %changelog
+* Mon Apr 16 2007 Ralf Ertzinger <ralf at skytale.net> 1.3.2-1.fc6
+- Update to 1.3.2
+
 * Sun Dec 24 2006 Ralf Ertzinger <ralf at skytale.net> 1.2.2-2.fc6
 - Remove audacious-1.1.1-controlsocket-name.patch due to request
   from upstream, xmms and audacious are not entirely compatible


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Dec 2006 16:40:58 -0000	1.6
+++ sources	16 Apr 2007 11:24:08 -0000	1.7
@@ -1 +1 @@
-e774afbda04220e6e1b0a9bff350522e  audacious-1.2.2.tgz
+b784a30604a2f9d84e9da310069f43f9  audacious-1.3.2.tgz


--- audacious-1.1.0-default-skin.patch DELETED ---


--- audacious-1.1.0-xmms-skins.patch DELETED ---