From 80d70019e97c8413e454da0f9691aa735aceb199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 10 Jan 2019 11:08:15 +0100 Subject: [PATCH] Remove Python 2 subpackage, BR gcc-c++ https://bugzilla.redhat.com/show_bug.cgi?id=1629790 --- libcaca.spec | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/libcaca.spec b/libcaca.spec index 9ded8cd..61b9474 100644 --- a/libcaca.spec +++ b/libcaca.spec @@ -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_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 Name: libcaca Version: 0.99 -Release: 0.37.%{beta}%{?dist} +Release: 0.38.%{beta}%{?dist} License: WTFPL Group: System Environment/Libraries URL: http://caca.zoy.org/wiki/libcaca Source: http://caca.zoy.org/files/libcaca/libcaca-%{version}.%{beta}.tar.gz Patch0: libcaca-0.99.beta16-multilib.patch -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: slang-devel BuildRequires: ncurses-devel BuildRequires: libX11-devel @@ -78,16 +72,6 @@ rendering features such as line and ellipses drawing, triangle filling and 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 Summary: Ruby bindings for libcaca Group: Development/Libraries @@ -112,7 +96,8 @@ sed -i -e 's|Config::CONFIG\["sitearchdir"\]|Config::CONFIG["vendorarchdir"]|' \ %configure \ --disable-static \ --disable-csharp \ - --disable-java + --disable-java \ + --disable-python # Remove useless rpath 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 @@ -165,10 +150,6 @@ rm -f %{buildroot}%{_docdir}/libcucul-dev %{_mandir}/man1/cacaview.1* %{_mandir}/man1/img2txt.1* -%files -n python2-caca -%doc python/examples -%{python2_sitelib}/caca/ - %files -n ruby-caca %doc ruby/README %{ruby_vendorlibdir}/caca.rb @@ -177,6 +158,9 @@ rm -f %{buildroot}%{_docdir}/libcucul-dev %changelog +* Thu Jan 10 2019 Miro HronĨok - 0.99-0.38.beta19 +- Remove Python 2 subpackage + * Fri Jul 13 2018 Fedora Release Engineering - 0.99-0.37.beta19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild