Hello community,
here is the log from the commit of package python-wxWidgets-3_0 for
openSUSE:Factory checked in at 2019-02-14 14:11:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-wxWidgets-3_0 (Old)
and /work/SRC/openSUSE:Factory/.python-wxWidgets-3_0.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-wxWidgets-3_0"
Thu Feb 14 14:11:50 2019 rev:10 rq:674463 version:3.0.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-wxWidgets-3_0/python-wxWidgets-3_0.changes
2018-08-15 10:31:52.487581830 +0200
+++
/work/SRC/openSUSE:Factory/.python-wxWidgets-3_0.new.28833/python-wxWidgets-3_0.changes
2019-02-14 14:11:52.648265603 +0100
@@ -1,0 +2,11 @@
+Wed Feb 13 09:33:23 UTC 2019 - Jan Engelhardt <[email protected]>
+
+- Equalize the different macro styles
+
+-------------------------------------------------------------------
+Tue Feb 12 12:35:21 UTC 2019 - Dominique Leuenberger <[email protected]>
+
+- Fix generation of -lang package file list
+- cleanup using spec-cleaner
+
+-------------------------------------------------------------------
@@ -787 +797,0 @@
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-wxWidgets-3_0.spec ++++++
--- /var/tmp/diff_new_pack.BKIQTt/_old 2019-02-14 14:11:53.592265133 +0100
+++ /var/tmp/diff_new_pack.BKIQTt/_new 2019-02-14 14:11:53.592265133 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-wxWidgets-3_0
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,21 +12,20 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-Name: python-wxWidgets-3_0
%define srcname wxPython
+%define wx_version %(echo "%version" | perl -pe 's{\\.\\d+\\.\\d+$}{}')
+%define wx_release %(echo "%version" | perl -pe 's{\\.\\d+$}{}')
+Name: python-wxWidgets-3_0
Version: 3.0.2.0
Release: 0
Summary: Python Bindings for wxWidgets
License: GPL-2.0-or-later
Group: Development/Languages/Python
-Url: http://www.wxpython.org/
-%define wx_version %(echo "%version" | perl -pe 's{\\.\\d+\\.\\d+$}{}')
-%define wx_release %(echo "%version" | perl -pe 's{\\.\\d+$}{}')
-
+URL: http://www.wxpython.org/
# Source from http://www.wxpython.org/ contains complete wxWidgets
# source tree and proprietary Microsoft Visual Studio DLLs.
# We will repackage only a needed subset of files.
@@ -36,7 +35,6 @@
Source3: extract-source.sh
Source4: pre_checkin.sh
Patch1: wxPython-platlib.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: perl
@@ -45,6 +43,12 @@
BuildRequires: python2-xml
BuildRequires: wxWidgets-3_0-devel
BuildRequires: xz
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+# In fact it should be >= %version but only version < 3.1
+Recommends: %name-lang = %version
+Conflicts: python-wxWidgets
+Conflicts: python2-wxWidgets
#Requires: wxWidgets-3_0 = %(rpm -q --qf="%%VERSION" wxWidgets-3_0)
# Used up to openSUSE 11.3:
Provides: python-wxGTK = %version
@@ -52,31 +56,25 @@
# Upstream name, never used in SUSE:
Provides: wxPython = %version
# Third party packages name, never used in SUSE:
-Provides: wxPython%wx_version-gtk2-unicode = %version
-# In fact it should be >= %version but only version < 3.1
-Recommends: %name-lang = %version
Provides: python-wxWidgets = %version
Provides: python2-wxWidgets = %version
-Conflicts: otherproviders(python-wxWidgets)
-Conflicts: otherproviders(python2-wxWidgets)
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Provides: wxPython%wx_version-gtk2-unicode = %version
%description
-wxWidgets is a free C++ library for cross-platform GUI.
+wxWidgets is a C++ library for cross-platform GUI.
This package contains the Python bindings for wxWidgets.
%package devel
Summary: Everything needed for development with wxPython
Group: Development/Languages/Python
Requires: %name = %version
+Conflicts: python-wxWidgets-devel
Provides: python-wxWidgets-devel = %version
-Conflicts: otherproviders(python-wxWidgets-devel)
%description devel
-wxWidgets is a free C++ library for cross-platform GUI development.
-With wxWidgets, you can create applications for different GUIs (GTK+,
-Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
+wxWidgets is a C++ library for cross-platform GUI development. With
+wxWidgets, applications for different GUIs (GTK+, Motif, MS Windows,
+MacOS X, Windows CE, GPE) can be created from the same source code.
This package contains all files needed for developing with Python
bindings for wxGTK.
@@ -86,14 +84,14 @@
Summary: Languages for package python-wxWidgets
Group: System/Localization
Requires: %name = %version
-Provides: %name-lang-all = %version
Supplements: packageand(bundle-lang-other:%name)
+Provides: %name-lang-all = %version
%description lang
Provides translations to the package %name.
%prep
-%setup -qn %srcname-src-%version
+%setup -q -n %srcname-src-%version
%patch -P 1 -p1
%build
@@ -120,76 +118,77 @@
# Create %%lang tags for mo files in non-standard path:
echo "%%defattr(-,root,root)" >Editra.lang
-for LNG_DIR in "%buildroot/%python_sitearch"/wx*/wx/tools/Editra/locale/*; do
+for LNG_DIR in "%buildroot%python_sitearch"/wx*/wx/tools/Editra/locale/*; do
LNG="${LNG_DIR##*/}"
- echo "%%lang($LNG)
%%python_sitearch${LNG_DIR#%buildroot/%python_sitearch}" >>Editra.lang
+ echo "%%lang($LNG)
%%python_sitearch${LNG_DIR#%buildroot%python_sitearch}" >>Editra.lang
done
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+mkdir -p %buildroot/%_sysconfdir/alternatives
for f in pywxrc editra helpviewer img2png img2py img2xpm pyalacarte pyalamode
pycrust pyshell pywrap xrced ; do
-mv %{buildroot}%{_bindir}/${f}
%{buildroot}%{_bindir}/${f}-%{python2_bin_suffix}
-ln -s -f %{_sysconfdir}/alternatives/${f} %{buildroot}%{_bindir}/${f}
+mv "%buildroot/%_bindir/$f" "%buildroot/%_bindir/$f-%python2_bin_suffix"
+ln -sf "%_sysconfdir/alternatives/$f" "%buildroot/%_bindir/$f"
done
%fdupes %buildroot/%_prefix
%post
-update-alternatives --install %{_bindir}/pywxrc pywxrc
%{_bindir}/pywxrc-%{python2_bin_suffix} %{python2_version_nodots} \
- --slave %{_bindir}/editra editra %{_bindir}/editra-%{python2_bin_suffix} \
- --slave %{_bindir}/helpviewer helpviewer
%{_bindir}/helpviewer-%{python2_bin_suffix} \
- --slave %{_bindir}/img2png img2png
%{_bindir}/img2png-%{python2_bin_suffix} \
- --slave %{_bindir}/img2py img2py %{_bindir}/img2py-%{python2_bin_suffix} \
- --slave %{_bindir}/img2xpm img2xpm
%{_bindir}/img2xpm-%{python2_bin_suffix} \
- --slave %{_bindir}/pyalacarte pyalacarte
%{_bindir}/pyalacarte-%{python2_bin_suffix} \
- --slave %{_bindir}/pyalamode pyalamode
%{_bindir}/pyalamode-%{python2_bin_suffix} \
- --slave %{_bindir}/pycrust pycrust
%{_bindir}/pycrust-%{python2_bin_suffix} \
- --slave %{_bindir}/pyshell pyshell
%{_bindir}/pyshell-%{python2_bin_suffix} \
- --slave %{_bindir}/pywrap pywrap %{_bindir}/pywrap-%{python2_bin_suffix} \
- --slave %{_bindir}/xrced xrced %{_bindir}/xrced-%{python2_bin_suffix} \
+update-alternatives --install %_bindir/pywxrc pywxrc
%_bindir/pywxrc-%python2_bin_suffix %python2_version_nodots \
+ --slave %_bindir/editra editra %_bindir/editra-%python2_bin_suffix \
+ --slave %_bindir/helpviewer helpviewer
%_bindir/helpviewer-%python2_bin_suffix \
+ --slave %_bindir/img2png img2png %_bindir/img2png-%python2_bin_suffix \
+ --slave %_bindir/img2py img2py %_bindir/img2py-%python2_bin_suffix \
+ --slave %_bindir/img2xpm img2xpm %_bindir/img2xpm-%python2_bin_suffix \
+ --slave %_bindir/pyalacarte pyalacarte
%_bindir/pyalacarte-%python2_bin_suffix \
+ --slave %_bindir/pyalamode pyalamode
%_bindir/pyalamode-%python2_bin_suffix \
+ --slave %_bindir/pycrust pycrust %_bindir/pycrust-%python2_bin_suffix \
+ --slave %_bindir/pyshell pyshell %_bindir/pyshell-%python2_bin_suffix \
+ --slave %_bindir/pywrap pywrap %_bindir/pywrap-%python2_bin_suffix \
+ --slave %_bindir/xrced xrced %_bindir/xrced-%python2_bin_suffix \
%postun
-if [ ! -f %{_bindir}/pywxrc ] ; then
- update-alternatives --remove pywxrc %{_bindir}/pywxrc-%{python2_bin_suffix}
+if [ ! -f %_bindir/pywxrc ] ; then
+ update-alternatives --remove pywxrc %_bindir/pywxrc-%python2_bin_suffix
fi
%files
%defattr(-,root,root)
-%doc wxPython/docs/*.txt wxPython/docs/*.html wxPython/docs/screenshots
wxPython/licence
-%{_bindir}/editra
-%{_bindir}/helpviewer
-%{_bindir}/img2png
-%{_bindir}/img2py
-%{_bindir}/img2xpm
-%{_bindir}/pyalacarte
-%{_bindir}/pyalamode
-%{_bindir}/pycrust
-%{_bindir}/pyshell
-%{_bindir}/pywrap
-%{_bindir}/pywxrc
-%{_bindir}/xrced
-%{_bindir}/editra-%{python2_bin_suffix}
-%{_bindir}/helpviewer-%{python2_bin_suffix}
-%{_bindir}/img2png-%{python2_bin_suffix}
-%{_bindir}/img2py-%{python2_bin_suffix}
-%{_bindir}/img2xpm-%{python2_bin_suffix}
-%{_bindir}/pyalacarte-%{python2_bin_suffix}
-%{_bindir}/pyalamode-%{python2_bin_suffix}
-%{_bindir}/pycrust-%{python2_bin_suffix}
-%{_bindir}/pyshell-%{python2_bin_suffix}
-%{_bindir}/pywrap-%{python2_bin_suffix}
-%{_bindir}/pywxrc-%{python2_bin_suffix}
-%{_bindir}/xrced-%{python2_bin_suffix}
-%ghost %{_sysconfdir}/alternatives/editra
-%ghost %{_sysconfdir}/alternatives/helpviewer
-%ghost %{_sysconfdir}/alternatives/img2png
-%ghost %{_sysconfdir}/alternatives/img2py
-%ghost %{_sysconfdir}/alternatives/img2xpm
-%ghost %{_sysconfdir}/alternatives/pyalacarte
-%ghost %{_sysconfdir}/alternatives/pyalamode
-%ghost %{_sysconfdir}/alternatives/pycrust
-%ghost %{_sysconfdir}/alternatives/pyshell
-%ghost %{_sysconfdir}/alternatives/pywrap
-%ghost %{_sysconfdir}/alternatives/pywxrc
-%ghost %{_sysconfdir}/alternatives/xrced
+%license wxPython/licence
+%doc wxPython/docs/*.txt wxPython/docs/*.html wxPython/docs/screenshots
+%_bindir/editra
+%_bindir/helpviewer
+%_bindir/img2png
+%_bindir/img2py
+%_bindir/img2xpm
+%_bindir/pyalacarte
+%_bindir/pyalamode
+%_bindir/pycrust
+%_bindir/pyshell
+%_bindir/pywrap
+%_bindir/pywxrc
+%_bindir/xrced
+%_bindir/editra-%python2_bin_suffix
+%_bindir/helpviewer-%python2_bin_suffix
+%_bindir/img2png-%python2_bin_suffix
+%_bindir/img2py-%python2_bin_suffix
+%_bindir/img2xpm-%python2_bin_suffix
+%_bindir/pyalacarte-%python2_bin_suffix
+%_bindir/pyalamode-%python2_bin_suffix
+%_bindir/pycrust-%python2_bin_suffix
+%_bindir/pyshell-%python2_bin_suffix
+%_bindir/pywrap-%python2_bin_suffix
+%_bindir/pywxrc-%python2_bin_suffix
+%_bindir/xrced-%python2_bin_suffix
+%ghost %_sysconfdir/alternatives/editra
+%ghost %_sysconfdir/alternatives/helpviewer
+%ghost %_sysconfdir/alternatives/img2png
+%ghost %_sysconfdir/alternatives/img2py
+%ghost %_sysconfdir/alternatives/img2xpm
+%ghost %_sysconfdir/alternatives/pyalacarte
+%ghost %_sysconfdir/alternatives/pyalamode
+%ghost %_sysconfdir/alternatives/pycrust
+%ghost %_sysconfdir/alternatives/pyshell
+%ghost %_sysconfdir/alternatives/pywrap
+%ghost %_sysconfdir/alternatives/pywxrc
+%ghost %_sysconfdir/alternatives/xrced
%python_sitearch/*
%python_sitelib/*
%exclude %python_sitearch/wx*/wx/tools/Editra/locale/*
