rpms/xmms2-nonfree/devel xmms2-0.8DrO_o-no-O0.patch, NONE, 1.1 xmms2-0.8DrO_o-use-libdir.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xmms2-nonfree.spec, 1.6, 1.7 xmms2-0.7DrNo-moresaneversioning.patch, 1.1, NONE xmms2-0.7DrNo-no-O0.patch, 1.1, NONE xmms2-0.7DrNo-use-libdir.patch, 1.1, NONE

[Orcan Ogetbil]

Author: oget

Update of /cvs/nonfree/rpms/xmms2-nonfree/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11007

Modified Files:
	.cvsignore sources xmms2-nonfree.spec 
Added Files:
	xmms2-0.8DrO_o-no-O0.patch xmms2-0.8DrO_o-use-libdir.patch 
Removed Files:
	xmms2-0.7DrNo-moresaneversioning.patch 
	xmms2-0.7DrNo-no-O0.patch xmms2-0.7DrNo-use-libdir.patch 
Log Message:
* Mon Dec 05 2011 John Doe <anonymous at american.us> 0.8-1
- Update to 0.8


xmms2-0.8DrO_o-no-O0.patch:
 wscript |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmms2-0.8DrO_o-no-O0.patch ---
diff -up xmms2-0.8DrO_o/wscript.noO0 xmms2-0.8DrO_o/wscript
--- xmms2-0.8DrO_o/wscript.noO0	2011-10-20 15:26:08.000000000 -0400
+++ xmms2-0.8DrO_o/wscript	2011-12-05 15:19:15.962065486 -0500
@@ -295,8 +295,8 @@ def configure(conf):
         conf.msg("uncommited changed", changed and "yes" or "no")
         conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
 
-    conf.env.append_unique('CFLAGS', ['-g', '-O0'])
-    conf.env.append_unique('CXXFLAGS', ['-g', '-O0'])
+    ##  conf.env.append_unique('CFLAGS', ['-g', '-O0'])
+    ## conf.env.append_unique('CXXFLAGS', ['-g', '-O0'])
 
     if conf.options.with_profiling:
         conf.env.with_profiling = True

xmms2-0.8DrO_o-use-libdir.patch:
 tool.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xmms2-0.8DrO_o-use-libdir.patch ---
diff -up xmms2-0.8DrO_o/waftools/tool.py.plugins-use-libdir xmms2-0.8DrO_o/waftools/tool.py
--- xmms2-0.8DrO_o/waftools/tool.py.plugins-use-libdir	2011-10-20 15:26:08.000000000 -0400
+++ xmms2-0.8DrO_o/waftools/tool.py	2011-12-05 14:56:47.867995794 -0500
@@ -6,5 +6,5 @@ def add_install_flag(bld, obj):
 
     if env['explicit_install_name']:
         libname = obj.env["cshlib_PATTERN"] % obj.target
-        insname = os.path.join(obj.env["PREFIX"], 'lib', libname)
+        insname = os.path.join(obj.env["LIBDIR"], libname)
         obj.env.append_unique("LINKFLAGS", ["-install_name", insname])


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Jul 2010 23:51:33 -0000	1.4
+++ .cvsignore	6 Dec 2011 03:24:11 -0000	1.5
@@ -1 +1 @@
-xmms2-0.7DrNo.tar.bz2
+xmms2-0.8DrO_o.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Jul 2010 23:51:33 -0000	1.4
+++ sources	6 Dec 2011 03:24:11 -0000	1.5
@@ -1 +1 @@
-60e50b591078acb6a85cd83de0f2b077  xmms2-0.7DrNo.tar.bz2
+84d5c05a70bfd31ed392a4e3f701eaa3  xmms2-0.8DrO_o.tar.bz2


Index: xmms2-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/xmms2-nonfree.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xmms2-nonfree.spec	1 Jul 2010 23:51:33 -0000	1.6
+++ xmms2-nonfree.spec	6 Dec 2011 03:24:11 -0000	1.7
@@ -1,20 +1,17 @@
-%global codename DrNo
+%global codename DrO_o
 
 Name:			xmms2-nonfree
 Summary:		Nonfree plugins for XMMS2
-Version:		0.7
+Version:		0.8
 Release:		1%{?dist}
 License:		LGPLv2+ and GPLv2+
 Group:			Applications/Multimedia
 # Fedora's xmms2 has to use a sanitized tarball, we don't.
 Source0:		http://downloads.sourceforge.net/xmms2/xmms2-%{version}%{codename}.tar.bz2
 # Use libdir properly for Fedora multilib
-Patch1:			xmms2-0.7DrNo-use-libdir.patch
-
+Patch0:			xmms2-0.8DrO_o-use-libdir.patch
 # Don't add extra CFLAGS, we're smart enough, thanks.
-Patch4:			xmms2-0.7DrNo-no-O0.patch
-# More sane versioning
-Patch5:			xmms2-0.7DrNo-moresaneversioning.patch
+Patch1:			xmms2-0.8DrO_o-no-O0.patch
 
 URL:			http://wiki.xmms2.xmms.se/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +20,7 @@
 BuildRequires:		python-devel
 # RPMFusion only BuildRequires
 BuildRequires:		mac-devel
-BuildRequires:		sidplay-libs-static
+BuildRequires:		sidplay-libs-devel
 
 Requires:		xmms2-mac = %{version}-%{release}
 Requires:		xmms2-sid = %{version}-%{release}
@@ -67,17 +64,8 @@
 %prep
 %setup -q -n xmms2-%{version}%{codename}
 
-%patch1 -p1 -b .plugins-use-libdir
-
-%patch4 -p1 -b .noO0
-%patch5 -p1 -b .versionsanity
-
-
-# Clean up paths in wafadmin
-WAFADMIN_FILES=`find wafadmin/ -type f`
-for i in $WAFADMIN_FILES; do
-	 sed -i 's|/usr/lib|%{_libdir}|g' $i
-done
+%patch0 -p1 -b .plugins-use-libdir
+%patch1 -p1 -b .noO0
 
 # For some reasons RPMFusion's sidplay libraries are moved to a
 # non-standard location. xmms2 can't detect this unless:
@@ -88,9 +76,6 @@
 ./waf configure --prefix=%{_prefix} \
 		--libdir=%{_libdir} \
 		--with-pkgconfigdir=%{_libdir}/pkgconfig \
-		--without-optionals=avahi \
-		--without-optionals=cli \
-		--without-optionals=dns_sd \
 		--without-optionals=et \
 		--without-optionals=launcher \
 		--without-optionals=medialib-updater \
@@ -191,6 +176,9 @@
 %{_libdir}/xmms2/libxmms_sid.so
 
 %changelog
+* Mon Dec 05 2011 John Doe <anonymous at american.us> 0.8-1
+- Update to 0.8
+
 * Thu Jul 01 2010 John Doe <anonymous at american.us> 0.7-1
 - Update to 0.7
 


--- xmms2-0.7DrNo-moresaneversioning.patch DELETED ---


--- xmms2-0.7DrNo-no-O0.patch DELETED ---


--- xmms2-0.7DrNo-use-libdir.patch DELETED ---