Author: oget Update of /cvs/nonfree/rpms/xmms2-nonfree/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19753 Modified Files: .cvsignore sources xmms2-nonfree.spec Added Files: xmms2-0.6DrMattDestruction-moresaneversioning.patch xmms2-0.6DrMattDestruction-use-libdir.patch Removed Files: xmms2-0.5DrLecter-moresaneversioning.patch xmms2-0.5DrLecter-use-libdir.patch xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch Log Message: * Wed Aug 12 2009 John Doe <anonymous(a)american.us&gt; 0.6-1 - Update to 0.6 xmms2-0.6DrMattDestruction-moresaneversioning.patch: --- NEW FILE xmms2-0.6DrMattDestruction-moresaneversioning.patch --- diff -up xmms2-0.6DrMattDestruction/wscript.versionsanity xmms2-0.6DrMattDestruction/wscript --- xmms2-0.6DrMattDestruction/wscript.versionsanity 2009-08-11 14:00:44.013247917 -0400 +++ xmms2-0.6DrMattDestruction/wscript 2009-08-11 14:01:48.446370522 -0400 @@ -23,7 +23,7 @@ import Build import Configure from logging import fatal, warning -BASEVERSION="0.6 DrMattDestruction" +BASEVERSION="0.6" APPNAME='xmms2' srcdir='.' @@ -269,14 +269,15 @@ def configure(conf): nam,changed = gittools.get_info() conf.check_message("git commit id", "", True, nam) - if Options.options.customversion: - conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion) - else: - dirty="" - if changed: - dirty="-dirty" - conf.check_message("uncommitted changes", "", bool(changed)) - conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) + ## if Options.options.customversion: + ## conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion) + ## else: + ## dirty="" + ## if changed: + ## dirty="-dirty" + ## conf.check_message("uncommitted changes", "", bool(changed)) + ## conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) + conf.env["VERSION"] = BASEVERSION ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] xmms2-0.6DrMattDestruction-use-libdir.patch: --- NEW FILE xmms2-0.6DrMattDestruction-use-libdir.patch --- diff -up xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD xmms2-0.6DrMattDestruction/src/include/xmms/wscript --- xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD 2009-08-11 15:17:57.020242949 -0400 +++ xmms2-0.6DrMattDestruction/src/include/xmms/wscript 2009-08-11 15:18:04.940381687 -0400 @@ -15,8 +15,7 @@ def configure(conf): defs = {} - defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'], - 'lib', 'xmms2') + defs['PKGLIBDIR'] = os.path.join(conf.env['LIBDIR'], 'xmms2') defs['BINDIR'] = conf.env['BINDIR'] defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'], 'share', 'xmms2') diff -up xmms2-0.6DrMattDestruction/waftools/tool.py.BAD xmms2-0.6DrMattDestruction/waftools/tool.py --- xmms2-0.6DrMattDestruction/waftools/tool.py.BAD 2009-08-11 15:28:30.157242468 -0400 +++ xmms2-0.6DrMattDestruction/waftools/tool.py 2009-08-11 15:28:45.251245035 -0400 @@ -6,5 +6,5 @@ def add_install_flag(bld, obj): if env['explicit_install_name']: libname = obj.env["shlib_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) diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py --- xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD 2009-08-11 15:33:10.276383650 -0400 +++ xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py 2009-08-11 15:33:33.646236480 -0400 @@ -45,7 +45,7 @@ def fakelibtool_build(task): fu("current=0\n") fu("age=0\nrevision=0\ninstalled=yes\nshouldnotlink=no\n") fu("dlopen=''\ndlpreopen=''\n") - fu("libdir='%s/lib'\n" % env['PREFIX']) + fu("libdir='%s'\n" % env['LIBDIR']) dest.close() return 0 @@ -75,7 +75,7 @@ def apply_link_libtool(self): self.latask = latask if Options.commands['install'] or Options.commands['uninstall']: - Build.bld.install_files('PREFIX', 'lib', linktask.outputs[0].abspath(self.env), self.env) + Build.bld.install_files('LIBDIR', linktask.outputs[0].abspath(self.env), self.env) @taskgen @feature("libtool") diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py --- xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD 2009-08-11 15:35:28.864257981 -0400 +++ xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py 2009-08-11 15:35:36.165270276 -0400 @@ -127,7 +127,7 @@ def vars_target_cprogram(self): @feature('cstaticlib', 'dstaticlib', 'cshlib', 'dshlib') @before('apply_core') def vars_target_cstaticlib(self): - self.default_install_path = '${PREFIX}/lib' + self.default_install_path = '${LIBDIR}' if sys.platform in ['win32', 'cygwin']: # on win32, libraries need the execute bit, else we # get 'permission denied' when using them (issue 283) diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py --- xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD 2009-08-11 15:35:49.334273249 -0400 +++ xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py 2009-08-11 15:36:35.058242288 -0400 @@ -39,7 +39,7 @@ libexecdir, program executables, $(EXEC_ sysconfdir, read-only single-machine data, $(PREFIX)/etc sharedstatedir, modifiable architecture-independent data, $(PREFIX)/com localstatedir, modifiable single-machine data, $(PREFIX)/var -libdir, object code libraries, $(EXEC_PREFIX)/lib +libdir, object code libraries, $(LIBDIR) includedir, C header files, $(PREFIX)/include oldincludedir, C header files for non-gcc, /usr/include datarootdir, read-only arch.-independent data root, $(PREFIX)/share Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Apr 2009 19:43:48 -0000 1.2 +++ .cvsignore 12 Aug 2009 09:32:45 -0000 1.3 @@ -1 +1 @@ -xmms2-0.5DrLecter.tar.bz2 +xmms2-0.6DrMattDestruction.tar.bz2 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Apr 2009 19:43:48 -0000 1.2 +++ sources 12 Aug 2009 09:32:45 -0000 1.3 @@ -1 +1 @@ -9033ef15be9069ef43aeb4b6360a4d36 xmms2-0.5DrLecter.tar.bz2 +954fb9c76b5db5e324a105e81b273200 xmms2-0.6DrMattDestruction.tar.bz2 Index: xmms2-nonfree.spec =================================================================== RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/xmms2-nonfree.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xmms2-nonfree.spec 9 Apr 2009 19:43:48 -0000 1.1 +++ xmms2-nonfree.spec 12 Aug 2009 09:32:45 -0000 1.2 @@ -1,22 +1,20 @@ -%global codename DrLecter +%global codename DrMattDestruction Name: xmms2-nonfree Summary: Nonfree plugins for XMMS2 -Version: 0.5 -Release: 3%{?dist} +Version: 0.6 +Release: 1%{?dist} License: LGPLv2+ 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 -# From upstream git (Compilation fixes) -Patch0: xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch # Use libdir properly for Fedora multilib -Patch1: xmms2-0.5DrLecter-use-libdir.patch +Patch1: xmms2-0.6DrMattDestruction-use-libdir.patch # Don't add extra CFLAGS, we're smart enough, thanks. Patch4: xmms2-0.5DrLecter-no-O0.patch # More sane versioning -Patch5: xmms2-0.5DrLecter-moresaneversioning.patch +Patch5: xmms2-0.6DrMattDestruction-moresaneversioning.patch URL: http://wiki.xmms2.xmms.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,7 +26,6 @@ Provides: xmms2-mac = %{version}-%{release} - %description XMMS2 is an audio framework, but it is not a general multimedia player - it will not play videos. It has a modular framework and plugin architecture for @@ -44,7 +41,7 @@ %prep %setup -q -n xmms2-%{version}%{codename} -%patch0 -p1 -b .compilefix + %patch1 -p1 -b .plugins-use-libdir %patch4 -p1 -b .noO0 @@ -78,6 +75,7 @@ --without-plugins=airplay \ --without-plugins=alsa \ --without-plugins=ao \ + --without-plugins=apefile \ --without-plugins=asf \ --without-plugins=asx \ --without-plugins=cdda \ @@ -89,15 +87,15 @@ --without-plugins=curl \ --without-plugins=file \ --without-plugins=flac \ + --without-plugins=flv \ --without-plugins=gme \ --without-plugins=gvfs \ + --without-plugins=html \ --without-plugins=ices \ --without-plugins=icymetaint \ --without-plugins=id3v2 \ --without-plugins=jack \ --without-plugins=karaoke \ - --without-plugins=lastfm \ - --without-plugins=lastfmeta \ --without-plugins=m3u \ --without-plugins=modplug \ --without-plugins=musepack \ @@ -112,6 +110,7 @@ --without-plugins=rss \ --without-plugins=samba \ --without-plugins=speex \ + --without-plugins=tta \ --without-plugins=vocoder \ --without-plugins=vorbis \ --without-plugins=wave \ @@ -154,6 +153,9 @@ %{_libdir}/xmms2/libxmms_mac.so %changelog +* Wed Aug 12 2009 John Doe <anonymous(a)american.us&gt; 0.6-1 +- Update to 0.6 + * Thu Apr 09 2009 John Doe <anonymous(a)american.us&gt; 0.5-3 - License is LGPLv2+ - Some SPEC file cosmetics --- xmms2-0.5DrLecter-moresaneversioning.patch DELETED --- --- xmms2-0.5DrLecter-use-libdir.patch DELETED --- --- xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch DELETED ---