diff --git a/xmms2-0.8DrO_o-xsubpp-fix.patch b/xmms2-0.8DrO_o-xsubpp-fix.patch new file mode 100644 index 0000000..2a05f15 --- /dev/null +++ b/xmms2-0.8DrO_o-xsubpp-fix.patch @@ -0,0 +1,12 @@ +diff -up .waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/perl.py.fixme .waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/perl.py +--- .waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/perl.py.fixme 2013-08-11 16:41:03.730842318 -0400 ++++ .waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/perl.py 2013-08-11 16:41:18.575842955 -0400 +@@ -60,7 +60,7 @@ def check_perl_ext_devel(self): + env['LINKFLAGS_PERLEXT']=read_out(" -MConfig -e'print $Config{lddlflags}'") + env['INCLUDES_PERLEXT']=read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'") + env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'") +- env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'") ++ env['XSUBPP']="/usr/bin/xsubpp" + env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'") + if not getattr(Options.options,'perlarchdir',None): + env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'") diff --git a/xmms2.spec b/xmms2.spec index 3d26099..c9ce1ac 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -21,6 +21,8 @@ Patch2: xmms2-0.8DrO_o-pulse-output-default.patch Patch4: xmms2-0.8DrO_o-no-O0.patch # More sane versioning Patch5: xmms2-0.8DrO_o-moresaneversioning.patch +# Fix xsubpp location +Patch6: xmms2-0.8DrO_o-xsubpp-fix.patch URL: http://wiki.xmms2.xmms.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel, flac-devel, libofa-devel @@ -125,6 +127,11 @@ export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" export LIBDIR="%{_libdir}" export PYTHONDIR="%{python_sitearch}" +export XSUBPP="%{_bindir}/xsubpp" +./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ + --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 +# Hacky, hacky, hacky. +patch -p0 < %{_sourcedir}/xmms2-0.8DrO_o-xsubpp-fix.patch ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 ./waf build -v %{?_smp_mflags} @@ -204,6 +211,8 @@ rm -rf %{buildroot} %changelog * Sun Aug 11 2013 Tom Callaway - 0.8-13 - add missing BuildRequires +- add disgusting hack to this awful package to get it building again. whoever invented waf + should be forced to endure severe punishment. * Sun Aug 04 2013 Fedora Release Engineering - 0.8-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild