rpms/audacious-plugins/devel .cvsignore, 1.26, 1.27 audacious-plugins.spec, 1.127, 1.128 sources, 1.27, 1.28

Wed Jul 21 13:34:37 UTC 2010

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7929

Modified Files:
	.cvsignore audacious-plugins.spec sources 
Log Message:
* Wed Jul 21 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.5.beta1
- ESD (EsounD) output plugin no longer available.
- BR curl-devel, scrobbler built by default.
- Add %check section to test availability of some files.
- Update to beta1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27

--- .cvsignore	15 Jul 2010 14:11:52 -0000	1.26
+++ .cvsignore	21 Jul 2010 13:34:36 -0000	1.27
@@ -1 +1 @@
-audacious-plugins-fedora-2.4-alpha3.tar.bz2
+audacious-plugins-fedora-2.4-beta1.tar.bz2


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- audacious-plugins.spec	15 Jul 2010 14:11:52 -0000	1.127
+++ audacious-plugins.spec	21 Jul 2010 13:34:36 -0000	1.128
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.4
-Release: 0.4.alpha3%{?dist}
+Release: 0.5.beta1%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -15,8 +15,8 @@ URL: http://audacious-media-player.org/
 # BSD: scrobbler/lastfm
 License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and GPLv3
 
-Source0: audacious-plugins-fedora-%{version}-alpha3.tar.bz2
-#Source0: http://distfiles.atheme.org/audacious-plugins-%{version}-alpha3.tgz
+Source0: audacious-plugins-fedora-%{version}-beta1.tar.bz2
+#Source0: http://distfiles.atheme.org/audacious-plugins-%{version}-beta1.tgz
 Source1: audacious-sid.desktop
 
 Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
@@ -30,7 +30,6 @@ BuildRequires: jack-audio-connection-kit
 BuildRequires: libsamplerate-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: pulseaudio-libs-devel
-BuildRequires: esound-devel
 BuildRequires: libsndfile-devel
 BuildRequires: wavpack-devel
 BuildRequires: libsidplay-devel
@@ -49,16 +48,13 @@ BuildRequires: libxml2-devel
 BuildRequires: libnotify-devel
 #BuildRequires: libprojectM-devel gtkglext-devel
 BuildRequires: libbs2b-devel
+BuildRequires: curl-devel
 
 # experimental, disabled by default
 BuildRequires: neon-devel
 
 Requires: audacious >= %{aud_ver}
 
-# temporarily till that upgrade is marked stable
-# Available: F11 updates, F12 updates
-#Requires: alsa-lib >= 1.0.22
-
 # last in 1.5.1, tagged dist-f11-updates
 Obsoletes: audacious-plugins-arts
 
@@ -74,6 +70,9 @@ Provides: audacious-plugins-wavpack = %{
 Obsoletes: audacious-plugins-vortex < 2.4
 Provides: audacious-plugins-vortex = %{version}-%{release}
 
+# last tagged dist-f14 and dist-f13-updates
+Obsoletes: audacious-plugins-esd < 2.4-0.6
+
 
 %description
 Audacious is a media player that currently uses a skinned user interface
@@ -95,16 +94,6 @@ This package provides an Audacious outpu
 Jack Audio Connection Kit (JACK) sound service.
 
 
-%package esd
-Summary: Audacious output plugin for EsounD service
-Group: Applications/Multimedia
-Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
-
-%description esd
-This package provides an Audacious output plugin that uses the
-EsounD service.
-
-
 %package amidi
 Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
@@ -130,7 +119,7 @@ providers may build it with libsidplay 2
 
 
 %prep
-%setup -q -n audacious-plugins-fedora-%{version}-alpha3
+%setup -q -n audacious-plugins-fedora-%{version}-beta1
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .libdir
 
@@ -144,13 +133,9 @@ grep -q -s __RPM_LIB * -R && exit 1
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
-# --disable-esd
-# --enable-neon : experimental, disabled by default
 %configure  \
     --enable-chardet  \
     --enable-amidiplug  \
-    --enable-neon  \
-    --enable-scrobbler  \
     \
     --disable-aac  \
     --disable-ffaudio  \
@@ -167,7 +152,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %find_lang %{name}
 # audacious-sid.desktop
@@ -176,6 +160,11 @@ desktop-file-install --vendor "" \
     %{SOURCE1}
 
 
+%check
+[ -f ${RPM_BUILD_ROOT}%{_libdir}/audacious/Transport/neon.so ]
+[ -f ${RPM_BUILD_ROOT}%{_libdir}/audacious/General/scrobbler.so ]
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -201,17 +190,12 @@ update-desktop-database &> /dev/null || 
 %exclude %{_libdir}/audacious/Input/amidi-plug/
 %exclude %{_libdir}/audacious/Input/sid.so
 %exclude %{_libdir}/audacious/Output/jackout.so
-%exclude %{_libdir}/audacious/Output/ESD.so
 %{_datadir}/audacious/
 
 %files jack
 %defattr(-,root,root,-)
 %{_libdir}/audacious/Output/jackout.so
 
-%files esd
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Output/ESD.so
-
 %files amidi
 %defattr(-,root,root,-)
 %{_libdir}/audacious/Input/amidi-plug.so
@@ -224,6 +208,12 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Jul 21 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.5.beta1
+- ESD (EsounD) output plugin no longer available.
+- BR curl-devel, scrobbler built by default.
+- Add %%check section to test availability of some files.
+- Update to beta1.
+
 * Thu Jul 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.4.alpha3
 - BR libnotify-devel for "notify" plugin.
 - Update to alpha3.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	15 Jul 2010 14:11:52 -0000	1.27
+++ sources	21 Jul 2010 13:34:37 -0000	1.28
@@ -1 +1 @@
-58219819038520af5fc1d3394f6d50e4  audacious-plugins-fedora-2.4-alpha3.tar.bz2
+383fdba7f8afc879c36dda6d8de1f0ec  audacious-plugins-fedora-2.4-beta1.tar.bz2

