X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=audacious.spec;h=d710a6d0a789c962ac2abfdc15686df011a5f4e3;hb=a3c25f9aa595cbbab092a25cfb00f2eaef1003f8;hp=fcd13eb0ae54d5c0833072e4096866a2647618fa;hpb=9b0d605631128f78762379d639329959ad732468;p=packages%2Faudacious.git

diff --git a/audacious.spec b/audacious.spec
index fcd13eb..d710a6d 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -2,35 +2,61 @@
 # Conditional build:
 %bcond_with	gconf		# build without gconf support
 #
-
 Summary:	Sound player with the WinAmp GUI, for Unix-based systems for GTK+2
 Summary(pl.UTF-8):	Odtwarzacz dźwięku z interfejsem WinAmpa dla GTK+2
 Name:		audacious
-Version:	1.3.2
+Version:	1.4.6
 Release:	1
 License:	GPL
 Group:		X11/Applications/Sound
-Source0:	http://static.audacious-media-player.org/release/%{name}-%{version}.tgz
-# Source0-md5:	b784a30604a2f9d84e9da310069f43f9
-Source1:	mp3license
+Source0:	http://distfiles.atheme.org/%{name}-%{version}.tbz2
+# Source0-md5:	fcaa5ecc376d36fab7cec2a69ec03aac
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-home_etc.patch
+Patch2:		%{name}-pc.patch
 URL:		http://audacious-media-player.org/
 %{?with_gconf:BuildRequires:	GConf2-devel >= 2.6.0}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
+BuildRequires:	dbus-devel >= 0.60
+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
+BuildRequires:	mcs-devel >= 0.4.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.198
 Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	audacious-output-plugin
+Requires:	audacious-transport-stdio
+Obsoletes:	audacious-container-mms
+Obsoletes:	audacious-container-stdio
+Obsoletes:	audacious-general-audioscrobbler
+Obsoletes:	audacious-general-curl
+Obsoletes:	audacious-general-notify
+Obsoletes:	audacious-input-cdaudio
+Obsoletes:	audacious-input-cube
+Obsoletes:	audacious-input-flac
+Obsoletes:	audacious-input-mikmod
+Obsoletes:	audacious-input-mpc
+Obsoletes:	audacious-input-mpg123
+Obsoletes:	audacious-input-mplayer
+Obsoletes:	audacious-input-sap
+Obsoletes:	audacious-output-ALSA
+Obsoletes:	audacious-output-OSS
+Obsoletes:	audacious-output-disk
+Obsoletes:	audacious-output-lame
 Obsoletes:	audacious-static
+Obsoletes:	audacious-transport-curl
+Obsoletes:	audacious-visualization-iris
+Obsoletes:	audacious-visualization-rovascope
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,6 +71,8 @@ rozwój pierwowzoru został zakończony.
 Summary:	Audacious media player library
 Summary(pl.UTF-8):	Biblioteka odtwarzacza multimedialnego Audacious
 Group:		X11/Applications/Sound
+Requires:	gtk+2 >= 2:2.6.0
+Requires:	libmowgli >= 0.4.0
 
 %description libs
 Audacious media player library.
@@ -57,8 +85,10 @@ Summary:	Header files for Audacious media player
 Summary(pl.UTF-8):	Pliki nagłówkowe odtwarzacza multimedialnego Audacious
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	dbus-glib-devel
 Requires:	gtk+2-devel >= 2:2.6.0
 Requires:	home-etc-devel
+Requires:	libmowgli-devel >= 0.4.0
 Requires:	mcs-devel
 
 %description devel
@@ -72,6 +102,7 @@ multimedialnego Audacious.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal} -I m4
@@ -79,17 +110,23 @@ multimedialnego Audacious.
 %{__autoheader}
 %configure \
 	--%{?with_gconf:en}%{!?with_gconf:dis}able-gconf \
+	--enable-samplerate \
 	--enable-shared
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/audacious/{Container,Effect,General,Input,Output,Visualization}
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/{Container,Effect,General,Input,Output,Transport,Visualization}
 
 %{__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}
 %find_lang %{name}
 
 %clean
@@ -113,16 +150,7 @@ EOF
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/audacious
 %attr(755,root,root) %{_bindir}/audtool
-%dir %{_libdir}/audacious
-%dir %{_libdir}/audacious/Container
-%dir %{_libdir}/audacious/Effect
-%dir %{_libdir}/audacious/General
-%dir %{_libdir}/audacious/Input
-%dir %{_libdir}/audacious/Output
-%dir %{_libdir}/audacious/Visualization
-
 %{_mandir}/man*/*
-
 %dir %{_datadir}/audacious
 %{_datadir}/audacious/glade
 %dir %{_datadir}/audacious/images
@@ -134,13 +162,23 @@ EOF
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libaudacious.so.*.*.*
-%ghost %attr(755,root,root) %{_libdir}/libaudacious.so.?
-%dir %{_libdir}/audacious
-%attr(755,root,root) %{_libdir}/audacious/libaudid3tag.so
+%attr(755,root,root) %{_libdir}/libaudclient.so.*.*.*
+%ghost %attr(755,root,root) %{_libdir}/libaudclient.so.?
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/Container
+%dir %{_libdir}/%{name}/Effect
+%dir %{_libdir}/%{name}/General
+%dir %{_libdir}/%{name}/Input
+%dir %{_libdir}/%{name}/Output
+%dir %{_libdir}/%{name}/Transport
+%dir %{_libdir}/%{name}/Visualization
+%attr(755,root,root) %{_libdir}/%{name}/libaudid3tag.so.*.*.*
+%attr(755,root,root) %{_libdir}/%{name}/libaudid3tag.so.?
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libaudacious.so
+%attr(755,root,root) %{_libdir}/libaudclient.so
+%attr(755,root,root) %{_libdir}/%{name}/libaudid3tag.so
 %{_includedir}/audacious
 %{_pkgconfigdir}/audacious.pc
+%{_pkgconfigdir}/audclient.pc