From 62760a9314ddf0ecb4a77657a8feba7b54a86adf Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Mar 18 2019 09:54:47 +0000 Subject: Subpackage python2-xmms2 has been removed --- diff --git a/xmms2.spec b/xmms2.spec index bf2e692..135b73a 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,11 +1,10 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %global codename DrO_o Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 58%{?dist} +Release: 59%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -37,20 +36,47 @@ Patch10: xmms2-0.8DrO_o-openssl-1.1.patch # Swap mind.in.a.box for free.music.and.free.beer Patch11: xmms2-0.8DrO_o-no-mind.in.a.box.patch URL: http://wiki.xmms2.xmms.se/ -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, 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 -BuildRequires: pkgconfig(avahi-client), pkgconfig(avahi-glib), pkgconfig(avahi-compat-libdns_sd) -BuildRequires: libvisual-devel, wavpack-devel, SDL-devel -BuildRequires: glib2-devel, readline-devel, ncurses-devel +BuildRequires: sqlite-devel +BuildRequires: flac-devel +BuildRequires: libofa-devel +BuildRequires: libcdio-paranoia-devel +BuildRequires: libdiscid-devel +BuildRequires: libsmbclient-devel +BuildRequires: libmpcdec-devel +BuildRequires: gnome-vfs2-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: fftw-devel +BuildRequires: libsamplerate-devel +BuildRequires: libxml2-devel +BuildRequires: alsa-lib-devel +BuildRequires: libao-devel +BuildRequires: libshout-devel +BuildRequires: ruby-devel +BuildRequires: ruby +BuildRequires: ruby(rubygems) +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: boost-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: libmodplug-devel +BuildRequires: ecore-devel +BuildRequires: gamin-devel +BuildRequires: mpg123-devel +BuildRequires: doxygen +BuildRequires: perl-Pod-Parser +BuildRequires: pkgconfig(avahi-client) +BuildRequires: pkgconfig(avahi-glib) +BuildRequires: pkgconfig(avahi-compat-libdns_sd) +BuildRequires: libvisual-devel +BuildRequires: wavpack-devel +BuildRequires: SDL-devel +BuildRequires: glib2-devel +BuildRequires: readline-devel +BuildRequires: ncurses-devel # For /usr/share/perl5/ExtUtils/xsubpp BuildRequires: perl-ExtUtils-ParseXS -BuildRequires: gcc, gcc-c++, python2-devel +BuildRequires: gcc +BuildRequires: gcc-c++ %description XMMS2 is an audio framework, but it is not a general multimedia player - it @@ -80,18 +106,6 @@ Requires: %{name} = %{version}-%{release} %description docs API documentation for the XMMS2 modular audio framework architecture. -%package -n python2-xmms2 -%{?python_provide:%python_provide python2-xmms2} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Summary: Python support for XMMS2 -Requires: %{name} = %{version}-%{release} - -%description -n python2-xmms2 -Python bindings for XMMS2. - %package perl Summary: Perl support for XMMS2 License: GPL+ or Artistic @@ -140,14 +154,13 @@ chmod -x src/include/xmmsclient/xmmsclient++/dict.h # done # sed -i 's|"lib"|"%{_lib}"|g' wscript for i in doc/tutorial/python/tut1.py doc/tutorial/python/tut2.py doc/tutorial/python/tut3.py doc/tutorial/python/tut4.py doc/tutorial/python/tut5.py doc/tutorial/python/tut6.py utils/gen-tree-hashes.py utils/gen-wiki-release-bugs.py utils/gen-tarball.py utils/gen-wiki-release-authors.py waf waftools/podselect.py waftools/genipc.py waftools/genipc_server.py waftools/cython.py; do - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|g' $i + sed -i 's|#!/usr/bin/env python|#!/usr/bin/python2|g' $i done %build export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" export LIBDIR="%{_libdir}" -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 +181,11 @@ doxygen %install rm -rf %{buildroot} export LIBDIR="%{_libdir}" -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}%{python2_sitearch}/xmmsclient/xmmsapi.so \ +chmod +x %{buildroot}%{_libdir}/%{name}/* %{buildroot}%{_libdir}/libxmmsclient*.so* \ %{buildroot}%{perl_archlib}/auto/Audio/XMMSClient/XMMSClient.so %{buildroot}%{ruby_vendorarchdir}/xmmsclient_*.so # Convert to utf-8 @@ -211,9 +223,6 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{perl_archlib}/Audio/ %{perl_archlib}/auto/Audio/ -%files -n python2-xmms2 -%{python2_sitearch}/xmmsclient/ - %files ruby %{ruby_vendorlibdir}/xmmsclient.rb %{ruby_vendorlibdir}/xmmsclient/ @@ -225,6 +234,10 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{_bindir}/nyxmms2 %changelog +* Sun Mar 17 2019 Miro Hrončok - 0.8-59 +- Subpackage python2-xmms2 has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Mon Feb 18 2019 Mamoru TASAKA - 0.8-58 - Yet more python2 explicit usage - Remove redundant BuildRequires