Author: draenog Date: Fri Aug 27 19:00:25 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 2.4.0 - obsoletes for plugins removed in audacious-plugins-2.4.0
---- Files affected: packages/audacious: audacious.spec (1.61 -> 1.62) , audacious-desktop.patch (1.11 -> 1.12) , audacious-home_etc.patch (1.9 -> 1.10) ---- Diffs: ================================================================ Index: packages/audacious/audacious.spec diff -u packages/audacious/audacious.spec:1.61 packages/audacious/audacious.spec:1.62 --- packages/audacious/audacious.spec:1.61 Tue Aug 24 23:32:00 2010 +++ packages/audacious/audacious.spec Fri Aug 27 21:00:20 2010 @@ -3,12 +3,12 @@ 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/ @@ -34,6 +34,7 @@ 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 @@ -53,6 +54,7 @@ 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 @@ -167,9 +169,10 @@ %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) @@ -179,8 +182,6 @@ %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} @@ -197,12 +198,10 @@ %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 @@ -212,6 +211,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.62 2010/08/27 19:00:20 draenog +- up to 2.4.0 +- obsoletes for plugins removed in audacious-plugins-2.4.0 + Revision 1.61 2010/08/24 21:32:00 hawk - release 4 ================================================================ Index: packages/audacious/audacious-desktop.patch diff -u packages/audacious/audacious-desktop.patch:1.11 packages/audacious/audacious-desktop.patch:1.12 --- packages/audacious/audacious-desktop.patch:1.11 Tue Apr 27 22:52:07 2010 +++ packages/audacious/audacious-desktop.patch Fri Aug 27 21:00:20 2010 @@ -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; ================================================================ Index: packages/audacious/audacious-home_etc.patch diff -u packages/audacious/audacious-home_etc.patch:1.9 packages/audacious/audacious-home_etc.patch:1.10 --- packages/audacious/audacious-home_etc.patch:1.9 Thu Apr 8 16:37:32 2010 +++ packages/audacious/audacious-home_etc.patch Fri Aug 27 21:00:20 2010 @@ -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; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacious/audacious.spec?r1=1.61&r2=1.62&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacious/audacious-desktop.patch?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacious/audacious-home_etc.patch?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
