Author: arvenil                      Date: Wed Nov  7 17:12:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged 1.4.0 from DEVEL
- release 1

---- Files affected:
SPECS:
   audacious.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/audacious.spec
diff -u SPECS/audacious.spec:1.27 SPECS/audacious.spec:1.28
--- SPECS/audacious.spec:1.27   Sat Nov  3 23:54:53 2007
+++ SPECS/audacious.spec        Wed Nov  7 18:12:15 2007
@@ -2,17 +2,16 @@
 #
 # 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
-Release:       2
+Version:       1.4.0
+Release:       1
 License:       GPL
 Group:         X11/Applications/Sound
-Source0:       
http://static.audacious-media-player.org/release/%{name}-%{version}.tgz
-# Source0-md5: b784a30604a2f9d84e9da310069f43f9
+Source0:       http://distfiles.atheme.org/%{name}-%{version}.tbz2
+# Source0-md5: 75b34e88cd2c4b335a2f18070bae56f6
 Source1:       mp3license
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
@@ -20,18 +19,42 @@
 %{?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
+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
 # [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,17 +105,21 @@
 %{__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/[EMAIL PROTECTED] ] || \
        mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name}
@@ -118,16 +145,7 @@
 %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
@@ -139,16 +157,26 @@
 
 %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
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -156,11 +184,65 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.27  2007/11/03 22:54:53  ankry
-- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+Revision 1.28  2007/11/07 17:12:15  arvenil
+- merged 1.4.0 from DEVEL
+- release 1
+
+Revision 1.24.4.16  2007/11/07 11:49:26  arvenil
+- audacious-plugins-ugly is discontinued, obsoletes all this plugins
+- fixed commit log
+
+Revision 1.24.4.15  2007/11/07 11:35:46  arvenil
+- added obsoletes from plugins packages (audacious-plugins.spec)
+- removed TODO (I resign from this idea)
+
+Revision 1.24.4.14  2007/11/06 23:59:47  arvenil
+- up to 1.4.0
+- NFY
+
+Revision 1.24.4.13  2007/11/04 22:32:22  arvenil
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED] (merged from HEAD)
+
+Revision 1.24.4.12  2007/11/04 22:22:46  arvenil
+- up to 1.4.0-rc1
+
+Revision 1.24.4.11  2007/10/29 21:56:05  arvenil
+- up tp 1.4.0-beta4
+- plugins dirs moved to audacious-libs
+
+Revision 1.24.4.10  2007/10/19 13:40:01  arvenil
+- up to 1.4.0-beta2
+
+Revision 1.24.4.9  2007/10/15 14:23:29  arvenil
+- up to 1.4.0-beta1
+- BR: libsamplerate -> libsamplerate-devel
+- Obsoletes: audacious-visualization-rovascope
+
+Revision 1.24.4.8  2007/09/14 15:53:45  arvenil
+- BR: libsamplerate
+- enabled libsamplerate support
+
+Revision 1.24.4.7  2007/09/13 21:39:47  arvenil
+- up to 1.4.0-dr4
+- BR: mcs-devel >= 0.4.0
+
+Revision 1.24.4.6  2007/09/10 17:06:06  arvenil
+- fix for last commit - now missing dir is really added;)
+
+Revision 1.24.4.5  2007/09/10 15:44:41  arvenil
+- added mising dir
+
+Revision 1.24.4.4  2007/09/09 23:02:04  arvenil
+- up to 1.4.0-dr3
+
+Revision 1.24.4.3  2007/08/11 10:51:27  arvenil
+- up to 1.4.0-dr2
+
+Revision 1.24.4.2  2007/07/28 12:11:52  arvenil
+- BR: libmowgli-devel (forgot to add)
 
-Revision 1.26  2007/07/26 18:21:43  arvenil
-- revert last commit (I have bad day; 1.4.0-dr1 goes to DEVEL)
+Revision 1.24.4.1  2007/07/26 18:18:05  arvenil
+- up to 1.4.0-dr1
 
 Revision 1.24  2007/04/05 15:38:05  arvenil
 - up to 1.3.2
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/audacious.spec?r1=1.27&r2=1.28&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to