From a2c634e718c617c5aece5ff8db8c3584564bf14b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Dec 05 2011 20:45:09 +0000 Subject: 0.8 --- diff --git a/.gitignore b/.gitignore index b14a441..647e200 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xmms2-0.7DrNo-clean.tar.bz2 +/xmms2-0.8DrO_o-clean.tar.bz2 diff --git a/sources b/sources index 018af4e..6acf504 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6495a6403783f0c98300e4bcad08ac84 xmms2-0.7DrNo-clean.tar.bz2 +010a1727b9ae4fcfa648b44a1d5e42db xmms2-0.8DrO_o-clean.tar.bz2 diff --git a/xmms2-0.8DrO_o-moresaneversioning.patch b/xmms2-0.8DrO_o-moresaneversioning.patch new file mode 100644 index 0000000..3ded289 --- /dev/null +++ b/xmms2-0.8DrO_o-moresaneversioning.patch @@ -0,0 +1,32 @@ +diff -up xmms2-0.8DrO_o/wscript.versionsanity xmms2-0.8DrO_o/wscript +--- xmms2-0.8DrO_o/wscript.versionsanity 2011-12-05 15:19:56.000000000 -0500 ++++ xmms2-0.8DrO_o/wscript 2011-12-05 15:22:01.885508715 -0500 +@@ -19,7 +19,7 @@ from waflib import Configure, Options, U + from waftools.compiler_flags import compiler_flags + from waftools import gittools + +-BASEVERSION="0.8 DrO_o" ++BASEVERSION="0.8" + APPNAME='xmms2' + + top = '.' +@@ -288,12 +288,13 @@ def configure(conf): + + nam,changed = gittools.get_info() + conf.msg("git commit id", nam) +- if conf.options.customversion: +- conf.env.VERSION = "%s (%s + %s)" % (BASEVERSION, nam, conf.options.customversion) +- else: +- dirty = changed and "-dirty" or "" +- conf.msg("uncommited changed", changed and "yes" or "no") +- conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty) ++ ## if conf.options.customversion: ++ ## conf.env.VERSION = "%s (%s + %s)" % (BASEVERSION, nam, conf.options.customversion) ++ ## else: ++ ## dirty = changed and "-dirty" or "" ++ ## conf.msg("uncommited changed", changed and "yes" or "no") ++ ## conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty) ++ conf.env.VERSION = "%s" % (BASEVERSION) + + ## conf.env.append_unique('CFLAGS', ['-g', '-O0']) + ## conf.env.append_unique('CXXFLAGS', ['-g', '-O0']) diff --git a/xmms2-0.8DrO_o-no-O0.patch b/xmms2-0.8DrO_o-no-O0.patch new file mode 100644 index 0000000..79c41e9 --- /dev/null +++ b/xmms2-0.8DrO_o-no-O0.patch @@ -0,0 +1,14 @@ +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 diff --git a/xmms2-0.8DrO_o-pulse-output-default.patch b/xmms2-0.8DrO_o-pulse-output-default.patch new file mode 100644 index 0000000..70c35a4 --- /dev/null +++ b/xmms2-0.8DrO_o-pulse-output-default.patch @@ -0,0 +1,10 @@ +diff -up xmms2-0.8DrO_o/src/plugins/pulse/wscript.default-output-pulse xmms2-0.8DrO_o/src/plugins/pulse/wscript +--- xmms2-0.8DrO_o/src/plugins/pulse/wscript.default-output-pulse 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/plugins/pulse/wscript 2011-12-05 14:59:38.466393458 -0500 +@@ -3,5 +3,5 @@ from waftools.plugin import plugin + def plugin_configure(conf): + conf.check_cfg(package="libpulse", args="--cflags --libs", uselib_store="pulse") + +-configure, build = plugin("pulse", configure=plugin_configure, output_prio=25, ++configure, build = plugin("pulse", configure=plugin_configure, output_prio=45, + libs=["pulse"]) diff --git a/xmms2-0.8DrO_o-use-libdir.patch b/xmms2-0.8DrO_o-use-libdir.patch new file mode 100644 index 0000000..a4e6623 --- /dev/null +++ b/xmms2-0.8DrO_o-use-libdir.patch @@ -0,0 +1,10 @@ +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]) diff --git a/xmms2.spec b/xmms2.spec index 8879e32..5921632 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,12 +1,12 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')} -%global codename DrNo +%global codename DrO_o Name: xmms2 Summary: A modular audio framework and plugin architecture -Version: 0.7 -Release: 11%{?dist} +Version: 0.8 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ and BSD Group: Applications/Multimedia # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. @@ -15,13 +15,13 @@ Group: Applications/Multimedia Source0: %{name}-%{version}%{codename}-clean.tar.bz2 Source1: xmms2-client-launcher.sh # Use libdir properly for Fedora multilib -Patch1: xmms2-0.7DrNo-use-libdir.patch +Patch1: xmms2-0.8DrO_o-use-libdir.patch # Set default output to pulse -Patch2: xmms2-0.6DrMattDestruction-pulse-output-default.patch +Patch2: xmms2-0.8DrO_o-pulse-output-default.patch # Don't add extra CFLAGS, we're smart enough, thanks. -Patch4: xmms2-0.7DrNo-no-O0.patch +Patch4: xmms2-0.8DrO_o-no-O0.patch # More sane versioning -Patch5: xmms2-0.7DrNo-moresaneversioning.patch +Patch5: xmms2-0.8DrO_o-moresaneversioning.patch URL: http://wiki.xmms2.xmms.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel, flac-devel, libofa-devel @@ -51,7 +51,7 @@ Summary: Development libraries and headers for XMMS2 Group: Development/Libraries Requires: glib2-devel, boost-devel Requires: pkgconfig -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development libraries and headers for XMMS2. You probably need this to develop @@ -113,16 +113,17 @@ it executes the command passed as argument directly. chmod -x src/include/xmmsclient/xmmsclient++/dict.h # 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 -sed -i 's|"lib"|"%{_lib}"|g' wscript +# WAFADMIN_FILES=`find wafadmin/ -type f` +# for i in $WAFADMIN_FILES; do +# sed -i 's|/usr/lib|%{_libdir}|g' $i +# done +# sed -i 's|"lib"|"%{_lib}"|g' wscript %build export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" export LIBDIR="%{_libdir}" +export PYTHONDIR="%{python_sitearch}" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 ./waf build -v %{?_smp_mflags} # make the docs @@ -142,7 +143,7 @@ chmod +x %{buildroot}%{_libdir}/%{name}/* %{buildroot}%{_libdir}/libxmmsclient*. for i in %{buildroot}%{_mandir}/man1/*.gz; do gunzip $i; done -for i in %{buildroot}%{_mandir}/man1/*.1 ChangeLog; do +for i in %{buildroot}%{_mandir}/man1/*.1 xmms2-0.8DrO_o.ChangeLog; do iconv -o $i.iso88591 -f iso88591 -t utf8 $i mv $i.iso88591 $i done @@ -158,9 +159,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL README TODO +%doc AUTHORS xmms2-0.8DrO_o.ChangeLog COPYING COPYING.GPL COPYING.LGPL README TODO %{_bindir}/%{name}* -%{_bindir}/vistest* %{_libdir}/libxmmsclient*.so.* %{_libdir}/%{name} %{_mandir}/man1/%{name}* @@ -193,9 +193,11 @@ rm -rf %{buildroot} %files -n nyxmms2 %defattr(-,root,root,-) %{_bindir}/nyxmms2 -%{_mandir}/man1/nyxmms2.* %changelog +* Mon Dec 5 2011 Tom Callaway - 0.8-1 +- update to 0.8 + * Sun Nov 20 2011 Adrian Reber - 0.7-11 - Rebuild for libcdio-0.83