rpms/xmp/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xmp.spec, 1.8, 1.9 xmp-2.7.1-audacious-api.patch, 1.1, NONE xmp-2.7.1-audacious-dialogs.patch, 1.1, NONE xmp-nostrip.patch, 1.1, NONE

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/xmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14979

Modified Files:
	.cvsignore sources xmp.spec 
Removed Files:
	xmp-2.7.1-audacious-api.patch 
	xmp-2.7.1-audacious-dialogs.patch xmp-nostrip.patch 
Log Message:
* Thu Jan 07 2010 Dominik Mierzejewski <rpm at greysector.net> 3.1.0-1
- updated to 3.1.0
- enabled parallel build
- dropped obsolete patches
- built with pulseaudio output support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Sep 2009 19:05:18 -0000	1.3
+++ .cvsignore	7 Jan 2010 21:05:08 -0000	1.4
@@ -1 +1 @@
-xmp-2.7.1-free.tar.gz
+xmp-3.1.0-free.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Sep 2009 19:05:18 -0000	1.3
+++ sources	7 Jan 2010 21:05:08 -0000	1.4
@@ -1 +1 @@
-b80fef62b1326bb5f0f970348ed8306f  xmp-2.7.1-free.tar.gz
+6ccb32394667e22f8a38d52f00e4551e  xmp-3.1.0-free.tar.gz


Index: xmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/xmp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xmp.spec	31 Dec 2009 12:28:17 -0000	1.8
+++ xmp.spec	7 Jan 2010 21:05:08 -0000	1.9
@@ -2,8 +2,8 @@
 %define xmms_input_plugin_dir %(xmms-config --input-plugin-dir)
 
 Name: xmp
-Version: 2.7.1
-Release: 2%{?dist}
+Version: 3.1.0
+Release: 1%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://dl.sourceforge.net/sourceforge/xmp/%{name}-%{version}.tar.gz
@@ -11,15 +11,11 @@ Group: Applications/Multimedia
 Source: http://rathann.fedorapeople.org/src/xmp/%{name}-%{version}-free.tar.gz
 # run this to get the above tarball
 Source1: mktarball.sh
-Patch0: %{name}-nostrip.patch
-# obsolete with XMP version upgrade
-Patch1: xmp-2.7.1-audacious-api.patch
-# merged upstream
-Patch2: xmp-2.7.1-audacious-dialogs.patch
 License: GPLv2+
 URL: http://xmp.sourceforge.net/
 Buildrequires: alsa-lib-devel
 Buildrequires: audacious-devel
+BuildRequires: pulseaudio-libs-devel
 Buildrequires: xmms-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 
@@ -58,9 +54,6 @@ This package contains the xmp plugin for
 
 %prep
 %setup -q
-%patch0 -p1 -b .nostrip
-%patch1 -p1 -b .audacious-dialogs
-%patch2 -p1 -b .audacious-api
 pushd docs
 for file in ChangeLog CREDITS ; do
 	iconv -f iso8859-1 -t utf8 -o $file.utf $file && touch -r $file $file.utf && mv $file.utf $file
@@ -69,11 +62,10 @@ done
 %build
 %configure \
   --enable-audacious-plugin \
+  --enable-pulseaudio \
   --enable-xmms-plugin
 
-#parallel make fails
-#%{__make} %{?_smp_mflags}
-%{__make}
+%{__make} %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -98,6 +90,12 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Thu Jan 07 2010 Dominik Mierzejewski <rpm at greysector.net> 3.1.0-1
+- updated to 3.1.0
+- enabled parallel build
+- dropped obsolete patches
+- built with pulseaudio output support
+
 * Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.7.1-2
 - fix FTBFS (#539061), Audacious 2.2 iplugin API change
 - fix Audacious plugin dialogs


--- xmp-2.7.1-audacious-api.patch DELETED ---


--- xmp-2.7.1-audacious-dialogs.patch DELETED ---


--- xmp-nostrip.patch DELETED ---