packages: audacious/audacious.spec, audacious/audacious-desktop.patch, auda...

draenog draenog at pld-linux.org
Thu Apr 8 16:37:37 CEST 2010 

Author: draenog                      Date: Thu Apr  8 14:37:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.3
- remove spurious BRs and configure option

---- Files affected:
packages/audacious:
   audacious.spec (1.55 -> 1.56) , audacious-desktop.patch (1.9 -> 1.10) , audacious-home_etc.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/audacious/audacious.spec
diff -u packages/audacious/audacious.spec:1.55 packages/audacious/audacious.spec:1.56
--- packages/audacious/audacious.spec:1.55	Sat Feb 27 22:11:12 2010
+++ packages/audacious/audacious.spec	Thu Apr  8 16:37:32 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.1
-Release:	5
+Version:	2.3
+Release:	1
 License:	GPL
 Group:		X11/Applications/Sound
 Source0:	http://distfiles.atheme.org/%{name}-%{version}.tgz
-# Source0-md5:	03ab6a062e5909214841f90f767f1147
+# Source0-md5:	b65753880c6762cdad6423df48590304
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-home_etc.patch
 URL:		http://audacious-media-player.org/
@@ -19,9 +19,7 @@
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 2:2.6.0
 BuildRequires:	home-etc-devel
-BuildRequires:	libglade2-devel >= 2.3.1
 BuildRequires:	libmowgli-devel >= 0.4.0
-BuildRequires:	libsamplerate-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	mcs-devel >= 0.4.0
 BuildRequires:	pkgconfig
@@ -30,7 +28,7 @@
 Requires:	%{name}-general-skins
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	audacious-output-plugin
-Requires:	audacious-transport-gio
+Requires:	audacious-transport-unix_io
 Obsoletes:	audacious-container-mms
 Obsoletes:	audacious-container-stdio
 Obsoletes:	audacious-general-audioscrobbler
@@ -98,7 +96,6 @@
 Requires:	gtk+2-devel >= 2:2.6.0
 Requires:	home-etc-devel
 Requires:	libmowgli-devel >= 0.4.0
-Requires:	libsamplerate-devel
 Requires:	mcs-devel
 
 %description devel
@@ -120,8 +117,7 @@
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
-%configure \
-	--enable-samplerate
+%configure
 
 %{__make}
 
@@ -164,25 +160,22 @@
 %dir %{_datadir}/audacious
 %dir %{_datadir}/audacious/images
 %{_datadir}/audacious/images/*
-%{_datadir}/audacious/Skins
 %{_datadir}/audacious/ui
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libSAD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libSAD.so.?
 %attr(755,root,root) %{_libdir}/libaudclient.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libaudclient.so.?
 %attr(755,root,root) %{_libdir}/libaudcore.so.*.*.*
 %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.?
-%attr(755,root,root) %{_libdir}/libaudutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libaudutil.so.?
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/Container
 %dir %{_libdir}/%{name}/Effect
@@ -194,15 +187,15 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libSAD.so
 %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
-%attr(755,root,root) %{_libdir}/libaudutil.so
 %{_includedir}/audacious
 %{_includedir}/libaudcore
-%{_includedir}/libSAD
+%{_includedir}/libaudgui
+%{_includedir}/libaudtag
 %{_pkgconfigdir}/audacious.pc
 %{_pkgconfigdir}/audclient.pc
 
@@ -212,6 +205,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2010/04/08 14:37:32  draenog
+- up to 2.3
+- remove spurious BRs and configure option
+
 Revision 1.55  2010/02/27 21:11:12  sparky
 - unify %attr() %ghost order
 

================================================================
Index: packages/audacious/audacious-desktop.patch
diff -u packages/audacious/audacious-desktop.patch:1.9 packages/audacious/audacious-desktop.patch:1.10
--- packages/audacious/audacious-desktop.patch:1.9	Thu Aug 27 14:50:46 2009
+++ packages/audacious/audacious-desktop.patch	Thu Apr  8 16:37:32 2010
@@ -1,22 +1,26 @@
-diff -burNp audacious-2.1/audacious2.desktop audacious-2.1-dud/audacious2.desktop
---- audacious-2.1/audacious2.desktop	2009-07-07 00:39:11.000000000 +0200
-+++ audacious-2.1-dud/audacious2.desktop	2009-08-23 12:41:55.678366986 +0200
-@@ -1,13 +1,14 @@
- [Desktop Entry]
- Name=Audacious2
- GenericName=Audio Player
+--- audacious-2.3/audacious2.desktop~	2010-04-06 21:01:24.000000000 +0100
++++ audacious-2.3/audacious2.desktop	2010-04-08 14:51:01.784418557 +0100
+@@ -14,6 +14,7 @@
+ GenericName[lt]=Muzikos grotuvas
+ GenericName[nl]=Muziekspeler
+ GenericName[no]=Lydavspiller
 +GenericName[pl]=Odtwarzacz muzyki
- Comment=Play music
--Comment[hu]=Zene lejátszása
- Comment[de]=Musik abspielen
-+Comment[hu]=Zene lejátszása
+ GenericName[pt]=Leitor de Música
+ GenericName[ro]=Lector de Muzică
+ GenericName[ru]=Аудиоплеер
+@@ -26,13 +27,14 @@
+ Comment[it]=Ascoltare musica
+ Comment[lt]=Klausyti muzikos
+ Comment[nl]=Muziek luisteren
 +Comment[pl]=Odtwarzacz muzyki
- Exec=audacious2 %U
+ Comment[ru]=Слушайте музыку
  Icon=audacious2
--MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;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
--Categories=Application;GTK;AudioVideo;Player;
-+MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;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;
-+Categories=GTK;AudioVideo;Player;
+ 
+-Categories=AudioVideo;Audio;Player;GTK;
+ 
+ Exec=audacious2 %U
+ TryExec=audacious2
  Terminal=false
- Type=Application
--Encoding=UTF-8
+ 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;
+++Categories=GTK;AudioVideo;Player;

================================================================
Index: packages/audacious/audacious-home_etc.patch
diff -u packages/audacious/audacious-home_etc.patch:1.8 packages/audacious/audacious-home_etc.patch:1.9
--- packages/audacious/audacious-home_etc.patch:1.8	Thu Aug 27 14:50:54 2009
+++ packages/audacious/audacious-home_etc.patch	Thu Apr  8 16:37:32 2010
@@ -12,23 +12,19 @@
 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
-@@ -137,13 +137,13 @@ aud_init_paths()
-     char *xdg_cache_home;
- 
-     xdg_config_home = (getenv("XDG_CONFIG_HOME") == NULL
--        ? g_build_filename(g_get_home_dir(), ".config", NULL)
-+	? g_build_filename(_HEdir, ".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_build_filename(_HEdir, ".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_build_filename(_HEdir, ".cache", NULL)
-         : g_strdup(getenv("XDG_CACHE_HOME")));
- 
-     aud_paths[BMP_PATH_USER_DIR] =
+@@ -127,9 +127,9 @@
+     gchar *xdg_data_home;
+     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")));
+
+     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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacious/audacious.spec?r1=1.55&r2=1.56&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacious/audacious-desktop.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacious/audacious-home_etc.patch?r1=1.8&r2=1.9&f=u

More information about the pld-cvs-commit mailing list