Hello community, here is the log from the commit of package libkate for openSUSE:Factory checked in at 2020-03-27 00:21:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkate (Old) and /work/SRC/openSUSE:Factory/.libkate.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkate" Fri Mar 27 00:21:40 2020 rev:22 rq:784191 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libkate/libkate.changes 2019-06-12 13:03:23.033257086 +0200 +++ /work/SRC/openSUSE:Factory/.libkate.new.3160/libkate.changes 2020-03-27 00:21:45.744149365 +0100 @@ -1,0 +2,6 @@ +Thu Mar 12 08:29:56 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Fix build wihtout python2 again, if any py interpreter is found + it tries to build with it (here it is pulled by doxygen) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkate.spec ++++++ --- /var/tmp/diff_new_pack.xtQ8c6/_old 2020-03-27 00:21:47.644150327 +0100 +++ /var/tmp/diff_new_pack.xtQ8c6/_new 2020-03-27 00:21:47.648150329 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkate # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2010 SUSE Dominique Leuenberger, Amsterdam, Netherlands # # All modifications and additions to the file contributed by third parties @@ -17,17 +17,12 @@ # -# python2_sitelib isn't defined in Leap:42.3 -%if 0%{?suse_version} <= 1315 -%define python2_sitelib %{python_sitelib} -%endif %bcond_without python2 Name: libkate Version: 0.4.1 Release: 0 Summary: A karaoke and text codec for embedding in Ogg License: BSD-3-Clause -Group: Productivity/Multimedia/Other URL: http://libkate.googlecode.com Source: http://libkate.googlecode.com/files/%{name}-%{version}.tar.gz Source99: baselibs.conf @@ -55,7 +50,6 @@ %package -n %{name}1 Summary: A karaoke and text codec for embedding in Ogg -Group: System/Libraries %description -n %{name}1 Kate is a codec for karaoke and text encapsulation for Ogg. Most of the @@ -71,7 +65,6 @@ %package -n liboggkate1 Summary: A karaoke and text codec for embedding in Ogg -Group: System/Libraries Conflicts: libkate1 < 0.4.1 %description -n liboggkate1 @@ -88,7 +81,6 @@ %package devel Summary: A karaoke and text codec for embedding in Ogg - Development Files -Group: Development/Libraries/C and C++ Requires: %{name}1 = %{version} Requires: glibc-devel Requires: liboggkate1 = %{version} @@ -110,7 +102,6 @@ %package tools Summary: A karaoke and text codec for embedding in Ogg -Group: Productivity/Multimedia/Other %description tools Kate is a codec for karaoke and text encapsulation for Ogg. Most of the @@ -126,7 +117,6 @@ %package -n python-katedj Summary: Editor and remixer for Kate streams in Ogg -Group: Productivity/Multimedia/Other Requires: %{name}-tools = %{version} Requires: oggz-tools Requires: python-wxWidgets @@ -144,9 +134,12 @@ %build echo 'HTML_TIMESTAMP=NO' >> doc/kate.doxygen.in +%if !%{with python2} +sed -i -e 's:PYTHON=python:PYTHON=python3:g' misc/autotools/py-compile +%endif %configure \ --disable-static -make %{?_smp_mflags} +%make_build %install %make_install @@ -156,11 +149,14 @@ %if %{with python2} %fdupes %{buildroot}%{python_sitelib}/kdj %else +# the py3 when found build system tries to compile and install it, and fails miserably +rm -rf %{buildroot}%{_bindir}/KateDJ +rm -rf %{buildroot}%{python3_sitelib} rm -rf %{buildroot}%{_mandir}/man1/KateDJ.1* %endif %check -make %{?_smp_mflags} check +%make_build check %post -n %{name}1 -p /sbin/ldconfig %postun -n %{name}1 -p /sbin/ldconfig @@ -198,7 +194,7 @@ %files -n python-katedj %{_bindir}/KateDJ %{_mandir}/man1/KateDJ.1%{?ext_man} -%{python2_sitelib}/kdj/ +%{python_sitelib}/kdj/ %endif %changelog
