- up to 2.4.0

- obsoletes for plugins removed in audacious-plugins-2.4.0

Changed files:
    audacious-desktop.patch -> 1.12
    audacious-home_etc.patch -> 1.10
    audacious.spec -> 1.62

diff --git a/audacious-desktop.patch b/audacious-desktop.patch
index bf119e489a072cd8aadc93e34be2e642d738096d..81ac5fd36901ac8eda8c2e30695f9079ce2c9cb7 100644 (file)
--- a/audacious-desktop.patch
+++ b/audacious-desktop.patch
@@ -14,13 +14,13 @@
  Comment[nl]=Muziek luisteren
 +Comment[pl]=Odtwarzacz muzyki
  Comment[ru]=Слушайте музыку
- Icon=audacious2
+ Comment[es]=Escucha música
+ Icon=audacious
  
 -Categories=AudioVideo;Audio;Player;GTK;
  
  Exec=audacious2 %U
  TryExec=audacious2
  Terminal=false
- StartupNotify=true
- MimeType=application/x-ogg;audio/midi;audio/mp3;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg;application/xspf+xml;
+ MimeType=application/x-ogg;audio/midi;audio/mp3;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg;application/xspf+xml;application/x-cue;
 +Categories=GTK;AudioVideo;Player;

diff --git a/audacious-home_etc.patch b/audacious-home_etc.patch
index 8fa52044078e7e9e1117d0220f44c19eab08dbd0..280cfb4ce0a75ff8223da4595d55520900ffc256 100644 (file)
--- a/audacious-home_etc.patch
+++ b/audacious-home_etc.patch
@@ -1,52 +1,57 @@
 diff -burNp audacious-2.1/src/audacious/configdb.h audacious-2.1-dud/src/audacious/configdb.h
 --- audacious-2.1/src/audacious/configdb.h     2009-07-07 00:39:12.000000000 +0200
 +++ audacious-2.1-dud/src/audacious/configdb.h 2009-08-23 12:50:48.874454861 +0200
-@@ -3,6 +3,7 @@
+@@ -3,7 +3,8 @@
  
  #include <glib.h>
  #include <libmcs/mcs.h>
+ #include <audacious/api.h>
 +#include <home_etc.h>
  
- G_BEGIN_DECLS
- 
+ #define AUD_API_NAME ConfigDBAPI
+ #define AUD_API_SYMBOL configdb_api
 diff -burNp audacious-2.1/src/audacious/main.c audacious-2.1-dud/src/audacious/main.c
 --- audacious-2.1/src/audacious/main.c 2009-07-07 00:39:12.000000000 +0200
 +++ audacious-2.1-dud/src/audacious/main.c     2009-08-23 12:52:28.224445099 +0200
-@@ -127,9 +127,9 @@
-     gchar *xdg_data_home;
+@@ -125,12 +125,12 @@
      gchar *xdg_cache_home;
-
--    xdg_config_home = (getenv("XDG_CONFIG_HOME") == NULL ? g_build_filename(g_get_home_dir(), ".config", NULL) : g_strdup(getenv("XDG_CONFIG_HOME")));
--    xdg_data_home = (getenv("XDG_DATA_HOME") == NULL ? g_build_filename(g_get_home_dir(), ".local", "share", NULL) : g_strdup(getenv("XDG_DATA_HOME")));
--    xdg_cache_home = (getenv("XDG_CACHE_HOME") == NULL ? g_build_filename(g_get_home_dir(), ".cache", NULL) : g_strdup(getenv("XDG_CACHE_HOME")));
-+    xdg_config_home = (getenv("XDG_CONFIG_HOME") == NULL ? g_build_filename(_HEdir, ".config", NULL) : g_strdup(getenv("XDG_CONFIG_HOME")));
-+    xdg_data_home = (getenv("XDG_DATA_HOME") == NULL ? g_build_filename(_HEdir,  ".local", "share", NULL) : g_strdup(getenv("XDG_DATA_HOME")));
-+    xdg_cache_home = (getenv("XDG_CACHE_HOME") == NULL ? g_build_filename(_HEdir,  ".cache", NULL) : g_strdup(getenv("XDG_CACHE_HOME")));
-
+ 
+     xdg_config_home = (getenv ("XDG_CONFIG_HOME") == NULL) ? g_build_filename
+-     (getenv ("HOME"), ".config", NULL) : g_strdup (getenv ("XDG_CONFIG_HOME"));
++     (_HEdir, ".config", NULL) : g_strdup (getenv ("XDG_CONFIG_HOME"));
+     xdg_data_home = (getenv ("XDG_DATA_HOME") == NULL) ? g_build_filename
+-     (getenv ("HOME"), ".local", "share", NULL) : g_strdup (getenv
++     (_HEdir, ".local", "share", NULL) : g_strdup (getenv
+      ("XDG_DATA_HOME"));
+     xdg_cache_home = (getenv ("XDG_CACHE_HOME") == NULL) ? g_build_filename
+-     (getenv ("HOME"), ".cache", NULL) : g_strdup (getenv ("XDG_CACHE_HOME"));
++     (_HEdir, ".cache", NULL) : g_strdup (getenv ("XDG_CACHE_HOME"));
+ 
      aud_paths[BMP_PATH_USER_DIR] = g_build_filename(xdg_config_home, "audacious", NULL);
      aud_paths[BMP_PATH_USER_SKIN_DIR] = g_build_filename(xdg_data_home, "audacious", "Skins", NULL);
 diff -burNp audacious-2.1/src/audacious/Makefile audacious-2.1-dud/src/audacious/Makefile
 --- audacious-2.1/src/audacious/Makefile       2009-07-07 00:39:12.000000000 +0200
 +++ audacious-2.1-dud/src/audacious/Makefile   2009-08-23 12:50:22.564458775 +0200
-@@ -168,6 +168,7 @@ LIBS += ${LDADD}                                           \
+@@ -168,7 +168,8 @@ LIBS += ${LDADD}                                           \
                ${DBUS_LIBS}                                    \
                ${MOWGLI_LIBS}                                  \
                ${LIBMCS_LIBS}                                  \
 +              -lhome_etc                                      \
-               ${REGEX_LIBS}
+               ${REGEX_LIBS}                                   \
+               ${LIBGUESS_LIBS}
  
  LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}
 diff -burNp audacious-2.1/src/audacious/util.c audacious-2.1-dud/src/audacious/util.c
 --- audacious-2.1/src/audacious/util.c 2009-07-07 00:39:12.000000000 +0200
 +++ audacious-2.1-dud/src/audacious/util.c     2009-08-23 12:53:44.297770774 +0200
-@@ -32,6 +32,7 @@
- #include "util.h"
+@@ -29,6 +29,7 @@
+ 
  
  #include <glib.h>
 +#include <home_etc.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
  #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
 @@ -932,7 +933,7 @@ util_get_localdir(void)
    gchar *tmp;
  

diff --git a/audacious.spec b/audacious.spec
index f3c9e80f4087b84571f2bce08e02ef06555900cb..a958cba4bf5d4a1a977fd3baaceaf511520e27b3 100644 (file)
--- a/audacious.spec
+++ b/audacious.spec
@@ -2,12 +2,12 @@ Summary:      Sound player with the WinAmp GUI, for Unix-based systems for GTK+2
 Summary(hu.UTF-8):     Zenelejátszó WinAmp-szerű felülettel GTK+2-t használó rendszerekhez
 Summary(pl.UTF-8):     Odtwarzacz dźwięku z interfejsem WinAmpa dla GTK+2
 Name:          audacious
-Version:       2.3
-Release:       4
+Version:       2.4.0
+Release:       1
 License:       GPL
 Group:         X11/Applications/Sound
 Source0:       http://distfiles.atheme.org/%{name}-%{version}.tgz
-# Source0-md5: b65753880c6762cdad6423df48590304
+# Source0-md5: 113d99a09d4faead7adc07a86eab5c80
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
 URL:           http://audacious-media-player.org/
@@ -33,6 +33,7 @@ Obsoletes:    audacious-container-stdio
 Obsoletes:     audacious-general-audioscrobbler
 Obsoletes:     audacious-general-curl
 Obsoletes:     audacious-general-notify
+Obsoletes:     audacious-general-vfstrace
 Obsoletes:     audacious-input-alac
 Obsoletes:     audacious-input-cdaudio
 Obsoletes:     audacious-input-cube
@@ -52,6 +53,7 @@ Obsoletes:    audacious-output-ALSA
 Obsoletes:     audacious-output-OSS
 Obsoletes:     audacious-output-arts
 Obsoletes:     audacious-output-disk
+Obsoletes:     audacious-output-icecast
 Obsoletes:     audacious-output-lame
 Obsoletes:     audacious-static
 Obsoletes:     audacious-transport-curl
@@ -166,9 +168,10 @@ EOF
 %dir %{_datadir}/audacious
 %dir %{_datadir}/audacious/images
 %{_datadir}/audacious/images/*
-%{_datadir}/audacious/ui
 %{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/apps/audacious.*
 %{_pixmapsdir}/*.png
+%{_pixmapsdir}/*.svg
 
 %files libs
 %defattr(644,root,root,755)
@@ -178,8 +181,6 @@ EOF
 %attr(755,root,root) %ghost %{_libdir}/libaudcore.so.?
 %attr(755,root,root) %{_libdir}/libaudgui.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libaudgui.so.?
-%attr(755,root,root) %{_libdir}/libaudid3tag.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libaudid3tag.so.?
 %attr(755,root,root) %{_libdir}/libaudtag.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libaudtag.so.?
 %dir %{_libdir}/%{name}
@@ -196,11 +197,9 @@ EOF
 %attr(755,root,root) %{_libdir}/libaudclient.so
 %attr(755,root,root) %{_libdir}/libaudcore.so
 %attr(755,root,root) %{_libdir}/libaudgui.so
-%attr(755,root,root) %{_libdir}/libaudid3tag.so
 %attr(755,root,root) %{_libdir}/libaudtag.so
 %{_includedir}/audacious
 %{_includedir}/libaudcore
 %{_includedir}/libaudgui
-%{_includedir}/libaudtag
 %{_pkgconfigdir}/audacious.pc
 %{_pkgconfigdir}/audclient.pc