Remove Python 2 subpackage, BR gcc-c++

https://bugzilla.redhat.com/show_bug.cgi?id=1629790
This commit is contained in:
Miro Hrončok 2019-01-10 11:08:15 +01:00
parent 2501c8928e
commit 80d70019e9

View File

@ -1,9 +1,3 @@
%if 0%{?rhel} && 0%{?rhel} <= 6
%{!?__python2: %global __python2 /usr/bin/python2}
%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
%{!?ruby_vendorlibdir: %global ruby_vendorlibdir %(ruby -r rbconfig -e 'print RbConfig::CONFIG["vendorlibdir"]')} %{!?ruby_vendorlibdir: %global ruby_vendorlibdir %(ruby -r rbconfig -e 'print RbConfig::CONFIG["vendorlibdir"]')}
%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -r rbconfig -e 'print RbConfig::CONFIG["vendorarchdir"]')} %{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -r rbconfig -e 'print RbConfig::CONFIG["vendorarchdir"]')}
@ -12,13 +6,13 @@
Summary: Library for Colour AsCii Art, text mode graphics Summary: Library for Colour AsCii Art, text mode graphics
Name: libcaca Name: libcaca
Version: 0.99 Version: 0.99
Release: 0.37.%{beta}%{?dist} Release: 0.38.%{beta}%{?dist}
License: WTFPL License: WTFPL
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://caca.zoy.org/wiki/libcaca URL: http://caca.zoy.org/wiki/libcaca
Source: http://caca.zoy.org/files/libcaca/libcaca-%{version}.%{beta}.tar.gz Source: http://caca.zoy.org/files/libcaca/libcaca-%{version}.%{beta}.tar.gz
Patch0: libcaca-0.99.beta16-multilib.patch Patch0: libcaca-0.99.beta16-multilib.patch
BuildRequires: gcc BuildRequires: gcc-c++
BuildRequires: slang-devel BuildRequires: slang-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -78,16 +72,6 @@ rendering features such as line and ellipses drawing, triangle filling and
sprite blitting. sprite blitting.
%package -n python2-caca
%{?python_provide:%python_provide python2-caca}
Summary: Python bindings for libcaca
Group: Development/Libraries
BuildRequires: python2-devel
%description -n python2-caca
This package contains the python bindings for using libcaca from python.
%package -n ruby-caca %package -n ruby-caca
Summary: Ruby bindings for libcaca Summary: Ruby bindings for libcaca
Group: Development/Libraries Group: Development/Libraries
@ -112,7 +96,8 @@ sed -i -e 's|Config::CONFIG\["sitearchdir"\]|Config::CONFIG["vendorarchdir"]|' \
%configure \ %configure \
--disable-static \ --disable-static \
--disable-csharp \ --disable-csharp \
--disable-java --disable-java \
--disable-python
# Remove useless rpath # Remove useless rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@ -165,10 +150,6 @@ rm -f %{buildroot}%{_docdir}/libcucul-dev
%{_mandir}/man1/cacaview.1* %{_mandir}/man1/cacaview.1*
%{_mandir}/man1/img2txt.1* %{_mandir}/man1/img2txt.1*
%files -n python2-caca
%doc python/examples
%{python2_sitelib}/caca/
%files -n ruby-caca %files -n ruby-caca
%doc ruby/README %doc ruby/README
%{ruby_vendorlibdir}/caca.rb %{ruby_vendorlibdir}/caca.rb
@ -177,6 +158,9 @@ rm -f %{buildroot}%{_docdir}/libcucul-dev
%changelog %changelog
* Thu Jan 10 2019 Miro Hrončok <mhroncok@redhat.com> - 0.99-0.38.beta19
- Remove Python 2 subpackage
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.99-0.37.beta19 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.99-0.37.beta19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild