X-Git-Url: http://git.pld-linux.org/?p=packages%2Faudacious.git;a=blobdiff_plain;f=audacious.spec;h=b44cbe1523858cd827c89a5ef6147cc3b2af3f08;hp=ac5d07b4e9566c367e49c26a1e2f2b1e31701d87;hb=4652f2d82d10d9cc32105f953ce8d39b7396ca23;hpb=ac640c61a20c2331b3d42f90c5a8de1de3fb04bf

diff --git a/audacious.spec b/audacious.spec
index ac5d07b..b44cbe1 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -2,14 +2,13 @@ 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
+Version:	3.0
 Release:	1
 License:	GPL
 Group:		X11/Applications/Sound
-Source0:	http://distfiles.atheme.org/%{name}-%{version}.tgz
-# Source0-md5:	b65753880c6762cdad6423df48590304
+Source0:	http://distfiles.atheme.org/%{name}-%{version}.tar.gz
+# Source0-md5:	8e05ccabeb110423bdfc6fc4a126c99e
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-home_etc.patch
 URL:		http://audacious-media-player.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -18,40 +17,55 @@ BuildRequires:	dbus-glib-devel >= 0.60
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 2:2.6.0
 BuildRequires:	home-etc-devel
-BuildRequires:	libmowgli-devel >= 0.4.0
+BuildRequires:	libmowgli-devel >= 0.9.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	mcs-devel >= 0.4.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.198
 Requires(post,postun):	desktop-file-utils
-Requires:	%{name}-general-skins
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	audacious-output-plugin
 Requires:	audacious-transport-unix_io
+Suggests:	%{name}-general-skins
 Obsoletes:	audacious-container-mms
 Obsoletes:	audacious-container-stdio
+Obsoletes:	audacious-effect-ladspa
+Obsoletes:	audacious-general-alarm
 Obsoletes:	audacious-general-audioscrobbler
 Obsoletes:	audacious-general-curl
-Obsoletes:	audacious-general-notify
+Obsoletes:	audacious-general-evdev
+Obsoletes:	audacious-general-lirc
+Obsoletes:	audacious-general-streambrowser
+Obsoletes:	audacious-general-vfstrace
+Obsoletes:	audacious-input-alac
 Obsoletes:	audacious-input-cdaudio
 Obsoletes:	audacious-input-cube
+Obsoletes:	audacious-input-demac
 Obsoletes:	audacious-input-flac
 Obsoletes:	audacious-input-mikmod
 Obsoletes:	audacious-input-mpc
 Obsoletes:	audacious-input-mpg123
 Obsoletes:	audacious-input-mplayer
+Obsoletes:	audacious-input-musepack
 Obsoletes:	audacious-input-sap
+Obsoletes:	audacious-input-timidity
+Obsoletes:	audacious-input-tta
 Obsoletes:	audacious-input-wav
+Obsoletes:	audacious-input-wma
 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
 Obsoletes:	audacious-visualization-iris
+Obsoletes:	audacious-visualization-paranormal
+Obsoletes:	audacious-visualization-projectM
 Obsoletes:	audacious-visualization-rootvis
 Obsoletes:	audacious-visualization-rovascope
+Obsoletes:	audacious-visualization-spectrum
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -110,7 +124,6 @@ multimedialnego Audacious.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal} -I m4
@@ -127,9 +140,6 @@ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/{Container,Effect,General,Input,Out
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# there is already .desktop in %{_desktopdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/audacious/applications
-
 [ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
 	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 mv $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
@@ -154,15 +164,16 @@ EOF
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/audacious2
-%attr(755,root,root) %{_bindir}/audtool2
+%attr(755,root,root) %{_bindir}/audacious
+%attr(755,root,root) %{_bindir}/audtool
 %{_mandir}/man*/*
 %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)
@@ -172,8 +183,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}
@@ -190,11 +199,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