rpms/xmms-modplug/devel xmms-modplug.spec, 1.22, 1.23 xmms-modplug-2.05-modplugplay-aoss.patch, 1.1, NONE

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/xmms-modplug/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv904

Modified Files:
	xmms-modplug.spec 
Removed Files:
	xmms-modplug-2.05-modplugplay-aoss.patch 
Log Message:
* Wed Jun 23 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.05-19
- Drop modplugplay, it's in modplugtools now (#600835).



Index: xmms-modplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-modplug/devel/xmms-modplug.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xmms-modplug.spec	31 May 2010 21:50:28 -0000	1.22
+++ xmms-modplug.spec	23 Jun 2010 15:46:49 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           xmms-modplug
 Version:        2.05
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Modplug Plugin for XMMS
 
 License:        Public Domain
@@ -11,14 +11,12 @@ URL:            http://modplug-xmms.sour
 Source:         http://dl.sf.net/modplug-xmms/modplugxmms-%{version}.tar.gz
 Patch0:         %{name}-2.05-archivers.patch
 Patch1:         %{name}-2.05-includes.patch
-Patch2:         %{name}-2.05-modplugplay-aoss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xmms-devel
 BuildRequires:  gtk+-devel
 BuildRequires:  gettext
 BuildRequires:  libmodplug-devel >= 1:0.7
-BuildRequires:  alsa-oss-devel
 BuildConflicts: %{name} < 2.0
 Requires:       xmms-libs%{?_isa}
 Provides:       modplug-xmms = %{version}-%{release}
@@ -29,31 +27,23 @@ plays mod-like music formats. It is base
 from ModPlug, a popular windows mod player written by Olivier
 Lapicque, found at <http://www.modplug.com/>.
 
-%package     -n modplugplay
-Summary:        Command line mod music player
-Group:          Applications/Multimedia
-
-%description -n modplugplay
-A command line mod music player.
-
 
 %prep
 %setup -q -n modplugxmms-%{version}
 sed -e 's|"/usr/bin/uzip"|"/usr/bin/unzip"|' %{PATCH0} | patch -p1
 %patch1 -p1
-%patch2 -p1
-touch -r configure modplugplay/Makefile.in # for patch2, avoid autotools re-run
 ln -sf %{_includedir}/xmms/plugin.h modplugxmms/plugin.h
 
 
 %build
 %configure
-make %{?_smp_mflags}
+make -C modplugxmms %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT XMMS_INPUT_PLUGIN_DIR=%{plugdir}
+make -C modplugxmms install \
+    DESTDIR=$RPM_BUILD_ROOT XMMS_INPUT_PLUGIN_DIR=%{plugdir}
 rm -f $RPM_BUILD_ROOT{%{_libdir}/*.la,%{plugdir}/*.la}
 
 
@@ -66,12 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING README TODO
 %{plugdir}/libmodplugxmms.so
 
-%files -n modplugplay
-%defattr(-,root,root,-)
-%{_bindir}/modplugplay
-
 
 %changelog
+* Wed Jun 23 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.05-19
+- Drop modplugplay, it's in modplugtools now (#600835).
+
 * Tue Jun  1 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.05-18
 - Rebuild.
 


--- xmms-modplug-2.05-modplugplay-aoss.patch DELETED ---