From bc8bd1edda8754c02a6670cdfe50c0b199e1df82 Mon Sep 17 00:00:00 2001 From: Kacper Kornet Date: Thu, 8 Apr 2010 14:37:32 +0000 Subject: [PATCH] - up to 2.3 - remove spurious BRs and configure option Changed files: audacious-desktop.patch -> 1.10 audacious-home_etc.patch -> 1.9 audacious.spec -> 1.56 --- audacious-desktop.patch | 40 ++++++++++++++++++++++------------------ audacious-home_etc.patch | 30 +++++++++++++----------------- audacious.spec | 27 ++++++++++----------------- 3 files changed, 45 insertions(+), 52 deletions(-) diff --git a/audacious-desktop.patch b/audacious-desktop.patch index 4047b2a..1f5449b 100644 --- a/audacious-desktop.patch +++ b/audacious-desktop.patch @@ -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; diff --git a/audacious-home_etc.patch b/audacious-home_etc.patch index e9ebde9..8fa5204 100644 --- a/audacious-home_etc.patch +++ b/audacious-home_etc.patch @@ -12,23 +12,19 @@ diff -burNp audacious-2.1/src/audacious/configdb.h audacious-2.1-dud/src/audacio 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 diff --git a/audacious.spec b/audacious.spec index d50ed32..35b413f 100644 --- 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.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/ @@ -18,9 +18,7 @@ BuildRequires: dbus-glib-devel >= 0.60 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 @@ -29,7 +27,7 @@ Requires(post,postun): desktop-file-utils 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 @@ -97,7 +95,6 @@ Requires: dbus-glib-devel 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 @@ -119,8 +116,7 @@ multimedialnego Audacious. %{__aclocal} -I m4 %{__autoconf} %{__autoheader} -%configure \ - --enable-samplerate +%configure %{__make} @@ -163,25 +159,22 @@ EOF %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 @@ -193,14 +186,14 @@ EOF %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 -- 2.44.0