From 742e71d6e05c5e600ad3e6c77f443a94ee297b80 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Feb 18 2019 11:54:14 +0000 Subject: Yet more python2 explicit usage Remove redundant BuildRequires --- diff --git a/xmms2.spec b/xmms2.spec index 598c42c..bf2e692 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -41,7 +41,7 @@ BuildRequires: sqlite-devel, flac-devel, libofa-devel BuildRequires: libcdio-paranoia-devel, libdiscid-devel, libsmbclient-devel BuildRequires: libmpcdec-devel, gnome-vfs2-devel, jack-audio-connection-kit-devel BuildRequires: fftw-devel, libsamplerate-devel, libxml2-devel, alsa-lib-devel -BuildRequires: libao-devel, libshout-devel, Pyrex, ruby-devel, ruby ruby(rubygems) +BuildRequires: libao-devel, libshout-devel, ruby-devel, ruby ruby(rubygems) BuildRequires: perl-devel, perl-generators, boost-devel, pulseaudio-libs-devel BuildRequires: libmodplug-devel, ecore-devel, gamin-devel, mpg123-devel BuildRequires: doxygen, perl-Pod-Parser @@ -147,7 +147,7 @@ done export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" export LIBDIR="%{_libdir}" -export PYTHONDIR="%{python_sitearch}" +export PYTHONDIR="%{python2_sitearch}" export XSUBPP="%{_bindir}/xsubpp" # Now with ruby22, the following waf fails until applying PATCH9 # Really want to know how to patch against waf beforehand... @@ -168,12 +168,12 @@ doxygen %install rm -rf %{buildroot} export LIBDIR="%{_libdir}" -export python_LIBDEST="%{python_sitearch}" +export python_LIBDEST="%{python2_sitearch}" ./waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig # exec flags for debuginfo -chmod +x %{buildroot}%{_libdir}/%{name}/* %{buildroot}%{_libdir}/libxmmsclient*.so* %{buildroot}%{python_sitearch}/xmmsclient/xmmsapi.so \ +chmod +x %{buildroot}%{_libdir}/%{name}/* %{buildroot}%{_libdir}/libxmmsclient*.so* %{buildroot}%{python2_sitearch}/xmmsclient/xmmsapi.so \ %{buildroot}%{perl_archlib}/auto/Audio/XMMSClient/XMMSClient.so %{buildroot}%{ruby_vendorarchdir}/xmmsclient_*.so # Convert to utf-8 @@ -225,6 +225,10 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{_bindir}/nyxmms2 %changelog +* Mon Feb 18 2019 Mamoru TASAKA - 0.8-58 +- Yet more python2 explicit usage +- Remove redundant BuildRequires + * Sun Feb 17 2019 Igor Gnatenko - 0.8-58 - Rebuild for readline 8.0