diff --git a/libcaca.changes b/libcaca.changes index 802a756..bcae986 100644 --- a/libcaca.changes +++ b/libcaca.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 23 18:32:31 UTC 2018 - tchvatal@suse.com + +- Drop the py2 bindings they fail to build using rpm macros and + somehow ingnore LD_LIBRARY_PATH, anyway provide py3 variant and + stick with that + ------------------------------------------------------------------- Tue Jan 23 10:18:53 UTC 2018 - tchvatal@suse.com diff --git a/libcaca.spec b/libcaca.spec index d7208c1..fcf74ed 100644 --- a/libcaca.spec +++ b/libcaca.spec @@ -16,8 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without python2 Name: libcaca Version: 0.99.beta19+git20171002.da28e96 Release: 0 @@ -36,7 +34,6 @@ Patch5: libcaca-ruby_vendor_install.patch Patch7: libcaca-0.99.beta16-missing-GLU.patch Patch9: caca-no-build-date.patch Patch10: libcaca-ncurses6.patch -BuildRequires: %{python_module setuptools} BuildRequires: doxygen BuildRequires: fdupes BuildRequires: freeglut-devel @@ -45,6 +42,7 @@ BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: python-rpm-macros +BuildRequires: python3-setuptools BuildRequires: ruby-devel BuildRequires: pkgconfig(ftgl) BuildRequires: pkgconfig(gl) @@ -82,18 +80,6 @@ Requires: %{name}0-plugins = %{version} This package contains the header files and static libraries needed to compile applications or shared objects that use libcaca. -%package -n python2-caca -Summary: Python2 support for libcaca -Group: Development/Languages/Python -Requires: %{name} = %{version} -Provides: %{name}-python = %{version} -Obsoletes: %{name}-python < %{version} -Provides: python-%{name} = %{version} -BuildArch: noarch - -%description -n python2-caca -This package contains all that is needed to use libcaca from python2. - %package -n python3-caca Summary: Python3 support for libcaca Group: Development/Languages/Python @@ -175,7 +161,7 @@ make %{?_smp_mflags} V=1 pushd python export LD_LIBRARY_PATH=$PWD/../caca/.libs/:$LD_LIBRARY_PATH export LANG=en_US.UTF-8 -%python_build +python3 setup.py build popd %install @@ -185,10 +171,8 @@ find %{buildroot} -type f -name "*.la" -delete -print pushd python export LD_LIBRARY_PATH=$PWD/../caca/.libs/:$LD_LIBRARY_PATH export LANG=en_US.UTF-8 -%python_install +python3 setup.py install -O1 --skip-build --force --root %{buildroot} --prefix %{_prefix} popd -%python_expand %fdupes %{buildroot}%{$python_sitelib} - %fdupes -s %{buildroot}%{_mandir}/ %post -n libcaca0 -p /sbin/ldconfig @@ -216,11 +200,6 @@ popd %{rb_vendorarch}/* %{rb_vendorlib}/caca.rb -%if %{with python2} -%files -n python2-caca -%{python2_sitelib}/* -%endif - %files -n python3-caca %{python3_sitelib}/*