Hello community, here is the log from the commit of package rrdtool for openSUSE:Factory checked in at 2018-01-16 09:35:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rrdtool (Old) and /work/SRC/openSUSE:Factory/.rrdtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rrdtool" Tue Jan 16 09:35:16 2018 rev:67 rq:561663 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes 2017-12-16 20:47:14.383306697 +0100 +++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2018-01-16 09:35:19.301484366 +0100 @@ -7,0 +8,6 @@ +Fri Nov 10 18:20:19 UTC 2017 - [email protected] + +- build bindings for Python 3 instead of Python 2 + * python3.patch + +------------------------------------------------------------------- New: ---- python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rrdtool.spec ++++++ --- /var/tmp/diff_new_pack.zAutZD/_old 2018-01-16 09:35:20.549425977 +0100 +++ /var/tmp/diff_new_pack.zAutZD/_new 2018-01-16 09:35:20.557425603 +0100 @@ -1,7 +1,7 @@ # # spec file for package rrdtool # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,6 +44,7 @@ Patch3: rrdtool-tclsegfault.patch # PATCH-FIX-UPSTREAM -- bnc#793636 Patch12: rrdtool-zero_vs_nothing.patch +Patch13: python3.patch # Needed for tests BuildRequires: bc BuildRequires: cairo-devel >= 1.2 @@ -62,8 +63,8 @@ BuildRequires: zlib-devel Requires: dejavu %if %{with python} -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools %endif %if %{with lua} BuildRequires: lua-devel @@ -149,13 +150,13 @@ %endif %if %{with python} -%package -n python-%{name} +%package -n python3-%{name} Summary: Python bindings for RRDtool Group: Development/Languages/Python Requires: %{name} = %{version}-%{release} -Requires: python +Requires: python3 -%description -n python-%{name} +%description -n python3-%{name} Python RRDtool bindings. %endif @@ -209,6 +210,7 @@ %setup -q %patch3 %patch12 -p1 +%patch13 -p1 # rrd_tool/rrd_cgi: use the date of the last change modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" @@ -217,6 +219,9 @@ find . -name '*.c' -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" "{}" "+" %build +# we are patching configure, we need to reconf +autoreconf -fi + # --disable-nls: there is only partial hungarian translation, does not make %{?_smp_mflags} # much sense to ship package for it %configure \ @@ -363,9 +368,9 @@ %endif %if %{with python} -%files -n python-%{name} +%files -n python3-%{name} %doc bindings/python/COPYING bindings/python/README.md -%{py_sitedir}/* +%{python3_sitearch}/* %endif %if %{with ruby} ++++++ python3.patch ++++++ Index: rrdtool-1.7.0/m4/acinclude.m4 =================================================================== --- rrdtool-1.7.0.orig/m4/acinclude.m4 +++ rrdtool-1.7.0/m4/acinclude.m4 @@ -426,12 +426,7 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"` -py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -fi +PYTHON_INCLUDES="-I"`$PYTHON -c "import sysconfig; print(sysconfig.get_path('include'))"` AC_SUBST(PYTHON_INCLUDES) dnl check if the headers exist: save_CPPFLAGS="$CPPFLAGS"
