Hello community,
here is the log from the commit of package yast2-python-bindings for
openSUSE:Factory checked in at 2020-02-18 10:34:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-python-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-python-bindings.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-python-bindings"
Tue Feb 18 10:34:12 2020 rev:44 rq:774424 version:4.1.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-python-bindings/yast2-python-bindings.changes
2019-05-22 15:37:48.066602881 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-python-bindings.new.26092/yast2-python-bindings.changes
2020-02-18 10:34:13.604188109 +0100
@@ -1,0 +2,13 @@
+Mon Feb 10 23:59:20 UTC 2020 - [email protected]
+
+- Don't overwrite CPPFLAGS/LDFLAGS/LIBADD during build; (bsc#1163310);
+- 4.1.2
+
+-------------------------------------------------------------------
+Thu Jan 9 09:45:58 UTC 2020 - Tomáš Chvátal <[email protected]>
+
+- Switch to python3 on new releases of openSUSE as we no longer
+ support python2 at all
+- Cleanup the spec file to adhere to current packaging guidelines
+
+-------------------------------------------------------------------
Old:
----
yast2-python-bindings-4.1.1.tar.bz2
New:
----
yast2-python-bindings-4.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-python-bindings.spec ++++++
--- /var/tmp/diff_new_pack.s14gIH/_old 2020-02-18 10:34:14.100189121 +0100
+++ /var/tmp/diff_new_pack.s14gIH/_new 2020-02-18 10:34:14.104189129 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-python-bindings
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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
@@ -16,22 +16,19 @@
#
-%if 0%{?suse_version} > 1310 || 0%{?fedora_version} > 20
-%define with_python3 1
+%bcond_without python3
+%if 0%{?suse_version} <= 1500
+%bcond_without python2
%else
-%define with_python3 0
+%bcond_with python2
%endif
-
Name: yast2-python-bindings
-Version: 4.1.1
+Version: 4.1.2
Release: 0
Summary: Python bindings for the YaST platform
License: GPL-2.0-only
Group: System/YaST
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
@@ -40,11 +37,6 @@
BuildRequires: libyui-devel
BuildRequires: make
BuildRequires: python
-BuildRequires: python-devel
-%if %{with_python3}
-BuildRequires: python3
-BuildRequires: python3-devel
-%endif
BuildRequires: python-rpm-macros
BuildRequires: swig
BuildRequires: yast2-core-devel
@@ -53,78 +45,79 @@
Requires: python
Requires: yast2-core
Requires: yast2-ycp-ui-bindings
-Obsoletes: yast2-python-bindings < 4.0.1
Conflicts: yast2-python3-bindings
+Obsoletes: yast2-python-bindings < 4.0.1
+%if %{with python2}
+BuildRequires: python-devel
+%endif
+%if %{with python3}
+BuildRequires: python3-devel
+%endif
%description -n yast2-python-bindings
The bindings allow YaST modules to be written using the Python language
and also Python scripts can use YaST agents, APIs and modules.
-%if %{with_python3}
%package -n yast2-python3-bindings
Summary: Python3 bindings for the YaST platform
Group: System/YaST
Requires: python3
Requires: yast2-core
Requires: yast2-ycp-ui-bindings
-Obsoletes: yast2-python-bindings == 4.0.1
Conflicts: yast2-python-bindings
+Obsoletes: yast2-python-bindings = 4.0.1
%description -n yast2-python3-bindings
The bindings allow YaST modules to be written using the Python language
and also Python scripts can use YaST agents, APIs and modules.
-%endif
-
-%define builddir %{_builddir}/%{name}-%{version}
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
-make -f Makefile.cvs all
-%if %{with_python3}
+make %{?_smp_mflags} -f Makefile.cvs all
+%if %{with python3}
mkdir py3 && pushd py3
ln -s ../configure configure
-%{configure} --enable-python3
+%configure --enable-python3
%make_build
popd
%endif
+%if %{with python2}
mkdir py2 && pushd py2
ln -s ../configure configure
-%{configure}
+%configure
%make_build
popd
+%endif
%install
%if %{with_python3}
%make_install -C py3
%endif
+%if %{with python2}
%make_install -C py2
+%endif
-%if %{with_python3}
+%if %{with python3}
%files -n yast2-python3-bindings
-%defattr (-, root, root)
%doc %{yast_docdir}
-%{python3_sitelib}/*.py
+%{python3_sitelib}/*
%{python3_sitearch}/_ycp.so
%{yast_plugindir}/libpy2lang_python3.so.*
%{yast_plugindir}/libpy2lang_python3.so
-%exclude %dir %{python3_sitelib}/__pycache__
-%exclude %{python3_sitelib}/__pycache__/*.pyc
-%exclude %{python3_sitelib}/__pycache__/*.pyo
%exclude %{yast_plugindir}/libpy2lang_python3.la
%endif
+%if %{with python2}
%files -n yast2-python-bindings
-%defattr (-, root, root)
%doc %{yast_docdir}
-%{python_sitelib}/*.py
+%{python_sitelib}/*
%{python_sitearch}/_ycp.so
%{yast_plugindir}/libpy2lang_python.so.*
%{yast_plugindir}/libpy2lang_python.so
%license COPYING
-%exclude %{python_sitelib}/*.pyc
-%exclude %{python_sitelib}/*.pyo
%exclude %{yast_plugindir}/libpy2lang_python.la
+%endif
%changelog
++++++ yast2-python-bindings-4.1.1.tar.bz2 ->
yast2-python-bindings-4.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-python-bindings-4.1.1/package/yast2-python-bindings.changes
new/yast2-python-bindings-4.1.2/package/yast2-python-bindings.changes
--- old/yast2-python-bindings-4.1.1/package/yast2-python-bindings.changes
2019-05-21 18:33:08.000000000 +0200
+++ new/yast2-python-bindings-4.1.2/package/yast2-python-bindings.changes
2020-02-14 19:11:00.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Mon Feb 10 23:59:20 UTC 2020 - [email protected]
+
+- Don't overwrite CPPFLAGS/LDFLAGS/LIBADD during build; (bsc#1163310);
+- 4.1.2
+
+-------------------------------------------------------------------
+Thu Jan 9 09:45:58 UTC 2020 - Tomáš Chvátal <[email protected]>
+
+- Switch to python3 on new releases of openSUSE as we no longer
+ support python2 at all
+- Cleanup the spec file to adhere to current packaging guidelines
+
+-------------------------------------------------------------------
Tue May 21 15:58:45 UTC 2019 - [email protected]
- yast2-python-bindings compilation errors when compiling with
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-python-bindings-4.1.1/package/yast2-python-bindings.spec
new/yast2-python-bindings-4.1.2/package/yast2-python-bindings.spec
--- old/yast2-python-bindings-4.1.1/package/yast2-python-bindings.spec
2019-05-21 18:33:08.000000000 +0200
+++ new/yast2-python-bindings-4.1.2/package/yast2-python-bindings.spec
2020-02-14 19:11:00.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-python-bindings
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,19 @@
#
-%if 0%{?suse_version} > 1310 || 0%{?fedora_version} > 20
-%define with_python3 1
+%bcond_without python3
+%if 0%{?suse_version} <= 1500
+%bcond_without python2
%else
-%define with_python3 0
+%bcond_with python2
%endif
-
Name: yast2-python-bindings
-Version: 4.1.1
+Version: 4.1.2
Release: 0
Summary: Python bindings for the YaST platform
License: GPL-2.0-only
Group: System/YaST
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
@@ -40,11 +37,6 @@
BuildRequires: libyui-devel
BuildRequires: make
BuildRequires: python
-BuildRequires: python-devel
-%if %{with_python3}
-BuildRequires: python3
-BuildRequires: python3-devel
-%endif
BuildRequires: python-rpm-macros
BuildRequires: swig
BuildRequires: yast2-core-devel
@@ -53,78 +45,79 @@
Requires: python
Requires: yast2-core
Requires: yast2-ycp-ui-bindings
-Obsoletes: yast2-python-bindings < 4.0.1
Conflicts: yast2-python3-bindings
+Obsoletes: yast2-python-bindings < 4.0.1
+%if %{with python2}
+BuildRequires: python-devel
+%endif
+%if %{with python3}
+BuildRequires: python3-devel
+%endif
%description -n yast2-python-bindings
The bindings allow YaST modules to be written using the Python language
and also Python scripts can use YaST agents, APIs and modules.
-%if %{with_python3}
%package -n yast2-python3-bindings
Summary: Python3 bindings for the YaST platform
Group: System/YaST
Requires: python3
Requires: yast2-core
Requires: yast2-ycp-ui-bindings
-Obsoletes: yast2-python-bindings == 4.0.1
Conflicts: yast2-python-bindings
+Obsoletes: yast2-python-bindings = 4.0.1
%description -n yast2-python3-bindings
The bindings allow YaST modules to be written using the Python language
and also Python scripts can use YaST agents, APIs and modules.
-%endif
-
-%define builddir %{_builddir}/%{name}-%{version}
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
-make -f Makefile.cvs all
-%if %{with_python3}
+make %{?_smp_mflags} -f Makefile.cvs all
+%if %{with python3}
mkdir py3 && pushd py3
ln -s ../configure configure
-%{configure} --enable-python3
+%configure --enable-python3
%make_build
popd
%endif
+%if %{with python2}
mkdir py2 && pushd py2
ln -s ../configure configure
-%{configure}
+%configure
%make_build
popd
+%endif
%install
%if %{with_python3}
%make_install -C py3
%endif
+%if %{with python2}
%make_install -C py2
+%endif
-%if %{with_python3}
+%if %{with python3}
%files -n yast2-python3-bindings
-%defattr (-, root, root)
%doc %{yast_docdir}
-%{python3_sitelib}/*.py
+%{python3_sitelib}/*
%{python3_sitearch}/_ycp.so
%{yast_plugindir}/libpy2lang_python3.so.*
%{yast_plugindir}/libpy2lang_python3.so
-%exclude %dir %{python3_sitelib}/__pycache__
-%exclude %{python3_sitelib}/__pycache__/*.pyc
-%exclude %{python3_sitelib}/__pycache__/*.pyo
%exclude %{yast_plugindir}/libpy2lang_python3.la
%endif
+%if %{with python2}
%files -n yast2-python-bindings
-%defattr (-, root, root)
%doc %{yast_docdir}
-%{python_sitelib}/*.py
+%{python_sitelib}/*
%{python_sitearch}/_ycp.so
%{yast_plugindir}/libpy2lang_python.so.*
%{yast_plugindir}/libpy2lang_python.so
%license COPYING
-%exclude %{python_sitelib}/*.pyc
-%exclude %{python_sitelib}/*.pyo
%exclude %{yast_plugindir}/libpy2lang_python.la
+%endif
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-python-bindings-4.1.1/src/Makefile.am
new/yast2-python-bindings-4.1.2/src/Makefile.am
--- old/yast2-python-bindings-4.1.1/src/Makefile.am 2019-05-21
18:33:08.000000000 +0200
+++ new/yast2-python-bindings-4.1.2/src/Makefile.am 2020-02-14
19:11:00.000000000 +0100
@@ -1,6 +1,6 @@
BUILT_SOURCES = ycp.py yast.py
ycp.py yast-core_wrap.cxx: yast-core.i ytypes.i ycp.i $(libpy2UI) YCPMap.h
y2log.i
- $(SWIG) $(AX_SWIG_PYTHON_OPT) -c++ -I/usr/include/YaST2 -o $@ $<
+ $(SWIG) $(AX_SWIG_PYTHON_OPT) -c++ -I/usr/include/YaST2 $(CPPFLAGS) -o
$@ $<
yast.py: yast.py.in
sed -e 's;[@]DATADIR[@];$(datadir);g' < $(srcdir)/yast.py.in >
$(srcdir)/yast.py
@@ -25,22 +25,22 @@
(cd $(DESTDIR)/${pyexecdir}; rm -f _ycp.so || echo)
SOURCES = Y2PythonComponent.cc Y2CCPython.cc YPython.cc YPythonNamespace.cc
YCPDeclarations.cc yast.cpp yast-core_wrap.cxx Y2PythonClientComponent.cc
Y2CCPythonClient.cc YPythonCode.cc PythonLogger.cc
-LIBADD = -L$(py2langdir) -lpy2UI -lpy2wfm
-LDFLAGS = -module ${PYTHON_LDFLAGS} -Wl,-rpath=$(pyexecdir)
-CPPFLAGS = -std=c++11 -I/usr/include/YaST2 ${PYTHON_CPPFLAGS} -Wno-terminate
-Wno-format-security -Wno-format-nonliteral
+LIB_LIBADD = -L$(py2langdir) -lpy2UI -lpy2wfm
+LIB_LDFLAGS = -module ${PYTHON_LDFLAGS} -Wl,-rpath=$(pyexecdir)
+LIB_CPPFLAGS = -std=c++11 -I/usr/include/YaST2 ${PYTHON_CPPFLAGS}
-Wno-terminate -Wno-format-security -Wno-format-nonliteral
if HAVE_PY3
py2lang_LTLIBRARIES = libpy2lang_python3.la
libpy2lang_python3_la_SOURCES = $(SOURCES)
-libpy2lang_python3_la_LIBADD = $(LIBADD)
-libpy2lang_python3_la_LDFLAGS = $(LDFLAGS)
-libpy2lang_python3_la_CPPFLAGS = $(CPPFLAGS)
+libpy2lang_python3_la_LIBADD = $(LIB_LIBADD)
+libpy2lang_python3_la_LDFLAGS = $(LIB_LDFLAGS)
+libpy2lang_python3_la_CPPFLAGS = $(LIB_CPPFLAGS)
else
py2lang_LTLIBRARIES = libpy2lang_python.la
libpy2lang_python_la_SOURCES = $(SOURCES)
-libpy2lang_python_la_LIBADD = $(LIBADD)
-libpy2lang_python_la_LDFLAGS = $(LDFLAGS)
-libpy2lang_python_la_CPPFLAGS = $(CPPFLAGS)
+libpy2lang_python_la_LIBADD = $(LIB_LIBADD)
+libpy2lang_python_la_LDFLAGS = $(LIB_LDFLAGS)
+libpy2lang_python_la_CPPFLAGS = $(LIB_CPPFLAGS)
endif
AM_CXXFLAGS = -DY2LOG=\"Python\"
