rpms/audacious/devel audacious-1.3.1-default-skin.patch, NONE, 1.1 audacious-1.3.1-xmms-skins.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 audacious.spec, 1.19, 1.20 sources, 1.7, 1.8 audacious-1.1.0-default-skin.patch, 1.1, NONE audacious-1.1.0-xmms-skins.patch, 1.1, NONE

Thu Mar 15 13:04:01 UTC 2007

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22828

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.1
- Rebase patches


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/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Nov 2006 09:36:37 -0000	1.7
+++ .cvsignore	15 Mar 2007 13:03:28 -0000	1.8
@@ -1 +1 @@
-audacious-1.2.2.tgz
+audacious-1.3.1.tgz


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- audacious.spec	24 Dec 2006 12:57:59 -0000	1.19
+++ audacious.spec	15 Mar 2007 13:03:28 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           audacious
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.3.1
+Release:        0.1%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -8,8 +8,8 @@
 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
+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
@@ -17,6 +17,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
+Patch10:        audacious-1.2.2-gdk-lock.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -24,6 +25,7 @@
 BuildRequires:  libglade2-devel >= 2.4
 BuildRequires:  GConf2-devel
 BuildRequires:  gettext
+BuildRequires:  mcs-devel >= 0.1
 
 Requires:       audacious-plugins >= 1.2.0
 
@@ -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
@@ -94,6 +96,9 @@
 # Fix "%20" in playlist entries
 # %patch8 -p1 -b playlist-twenty
 
+# Fix lockup with a11y
+# %patch10 -p1 -b .gdk-lock
+
 %build
 %configure \
     --disable-rpath \
@@ -165,6 +170,7 @@
 
 %files libs
 %defattr(-,root,root,-)
+%{_libdir}/audacious
 %{_libdir}/*.so.*
 
 %files devel
@@ -175,6 +181,10 @@
 
 
 %changelog
+* Wed Mar 14 2007 Ralf Ertzinger <ralf at skytale.net> 1.3.1-1.fc7
+- Update to 1.3.1
+- Rebase still necessary patches
+
 * Sun Dec 24 2006 Ralf Ertzinger <ralf at skytale.net> 1.2.2-2.fc7
 - 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/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2006 09:36:37 -0000	1.7
+++ sources	15 Mar 2007 13:03:28 -0000	1.8
@@ -1 +1 @@
-e774afbda04220e6e1b0a9bff350522e  audacious-1.2.2.tgz
+6dd04268a8b52a991cd1f561e27dca16  audacious-1.3.1.tgz


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


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


