rpms/audacious-plugins/devel .cvsignore, 1.24, 1.25 audacious-plugins.spec, 1.123, 1.124 sources, 1.25, 1.26 audacious-plugins-2.2-adplug-lds.patch, 1.1, NONE audacious-plugins-2.2-amidi.patch, 1.3, NONE audacious-plugins-2.4-neon-session-destroy.patch, 1.1, NONE audacious-plugins-2.4-projectm-includes.patch, 1.1, NONE

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	.cvsignore audacious-plugins.spec sources 
Removed Files:
	audacious-plugins-2.2-adplug-lds.patch 
	audacious-plugins-2.2-amidi.patch 
	audacious-plugins-2.4-neon-session-destroy.patch 
	audacious-plugins-2.4-projectm-includes.patch 
Log Message:
* Tue Jun 29 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.3.alpha2
- Returned: scrobbler/last.fm plugin (--enable-scrobbler)
- Remaining neon patch merged upstream.
- Update to alpha2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	12 Jun 2010 08:10:29 -0000	1.24
+++ .cvsignore	29 Jun 2010 17:53:39 -0000	1.25
@@ -1 +1 @@
-audacious-plugins-2.4-alpha1.tgz
+audacious-plugins-fedora-2.4-alpha2.tar.bz2


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- audacious-plugins.spec	14 Jun 2010 11:34:18 -0000	1.123
+++ audacious-plugins.spec	29 Jun 2010 17:53:39 -0000	1.124
@@ -5,32 +5,22 @@
 
 Name: audacious-plugins
 Version: 2.4
-Release: 0.2.alpha1%{?dist}
+Release: 0.3.alpha2%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
 
 # LGPLv2+: adplug, bio2jack, rocklight
 # MIT: crystalizer, dockalbumart
-# BSD: scrobbler/lastfm (removed pre-2.4-alpha1)
+# BSD: scrobbler/lastfm
 License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and GPLv3
 
-Source0: http://distfiles.atheme.org/audacious-plugins-%{version}-alpha1.tgz
+Source0: http://distfiles.atheme.org/audacious-plugins-%{version}-alpha2.tgz
 Source1: audacious-sid.desktop
 
 Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
 # fix hardcoded libdir replacement
 Patch1: audacious-plugins-2.4-libdir.patch
-# additional safety not merged upstream with neon patches
-Patch2: audacious-plugins-2.4-neon-session-destroy.patch
-# merged upstream
-Patch3: audacious-plugins-2.2-adplug-lds.patch
-# div-by-zero with almost empty MIDI file, bz 573851
-# merged upstream
-# (!) modified patch file vs. F-13
-Patch4: audacious-plugins-2.2-amidi.patch
-# merged upstream
-Patch5: audacious-plugins-2.4-projectm-includes.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext
@@ -138,13 +128,9 @@ providers may build it with libsidplay 2
 
 
 %prep
-%setup -q -n audacious-plugins-%{version}-alpha1
+%setup -q -n audacious-plugins-%{version}-alpha2
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .libdir
-%patch2 -p1 -b .neon-session-destroy
-%patch3 -p1 -b .lds-out-of-bounds
-%patch4 -p1 -b .amidi
-#patch5 -p1 -b .projectm-includes
 
 for i in src/ladspa/ladspa.c
 do
@@ -162,6 +148,7 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     --enable-chardet  \
     --enable-amidiplug  \
     --enable-neon  \
+    --enable-scrobbler  \
     \
     --disable-aac  \
     --disable-ffaudio  \
@@ -235,6 +222,11 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Jun 29 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.3.alpha2
+- Returned: scrobbler/last.fm plugin (--enable-scrobbler)
+- Remaining neon patch merged upstream.
+- Update to alpha2.
+
 * Mon Jun 14 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.2.alpha1
 - Don't build projectM plugin, because it causes a C++ segfault on app exit
   even if just linking with libprojectM.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	12 Jun 2010 08:10:29 -0000	1.25
+++ sources	29 Jun 2010 17:53:39 -0000	1.26
@@ -1 +1 @@
-e33dd862d67e1355ca35bf1bdd9c446b  audacious-plugins-2.4-alpha1.tgz
+6d38ea41ba292df2dd3bd6cfc84b04aa  audacious-plugins-fedora-2.4-alpha2.tar.bz2


--- audacious-plugins-2.2-adplug-lds.patch DELETED ---


--- audacious-plugins-2.2-amidi.patch DELETED ---


--- audacious-plugins-2.4-neon-session-destroy.patch DELETED ---


--- audacious-plugins-2.4-projectm-includes.patch DELETED ---