openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2017
- 1 participants
- 2097 discussions
Hello community,
here is the log from the commit of package qtractor for openSUSE:Factory checked in at 2017-08-29 11:47:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qtractor (Old)
and /work/SRC/openSUSE:Factory/.qtractor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtractor"
Tue Aug 29 11:47:20 2017 rev:45 rq:519267 version:0.8.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/qtractor/qtractor.changes 2017-07-02 13:38:46.438020952 +0200
+++ /work/SRC/openSUSE:Factory/.qtractor.new/qtractor.changes 2017-08-29 11:48:14.753095957 +0200
@@ -1,0 +2,5 @@
+Fri Aug 25 06:10:58 UTC 2017 - olaf(a)aepfle.de
+
+- Enable mad and Qt5 unconditionally
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtractor.spec ++++++
--- /var/tmp/diff_new_pack.NA87z0/_old 2017-08-29 11:48:15.704961793 +0200
+++ /var/tmp/diff_new_pack.NA87z0/_new 2017-08-29 11:48:15.720959539 +0200
@@ -16,8 +16,6 @@
#
-%bcond_with mad
-
Name: qtractor
Version: 0.8.3
Release: 0
@@ -42,23 +40,16 @@
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel >= 1.0.11
BuildRequires: libvorbis-devel
-%if 0%{?suse_version} > 1310
BuildRequires: libqt5-linguist
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xml)
-%else
-BuildRequires: libqt4-devel
-BuildRequires: libqt4-linguist
-%endif
BuildRequires: zlib-devel
BuildRequires: pkgconfig(lilv-0)
BuildRequires: pkgconfig(shared-mime-info)
-%if %{with mad}
BuildRequires: pkgconfig(mad)
-%endif
Requires: jack
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,11 +69,7 @@
%patch2
%build
-%if 0%{?suse_version} > 1310
%configure
-%else
-%configure --enable-qt4
-%endif
make %{?_smp_mflags}
%install
1
0
Hello community,
here is the log from the commit of package love-0_7_2 for openSUSE:Factory checked in at 2017-08-29 11:47:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/love-0_7_2 (Old)
and /work/SRC/openSUSE:Factory/.love-0_7_2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "love-0_7_2"
Tue Aug 29 11:47:13 2017 rev:2 rq:519246 version:0.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/love-0_7_2/love-0_7_2.changes 2015-08-24 01:30:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.love-0_7_2.new/love-0_7_2.changes 2017-08-29 11:48:13.377289874 +0200
@@ -1,0 +2,9 @@
+Mon Aug 28 23:17:52 UTC 2017 - jengelh(a)inai.de
+
+- Make build with new /usr/include/lua5.1 directory work again.
+- Rename freetype.diff to system-packages.diff.
+- Remove love-remove-mpg123.patch: mpg123 is available in
+ openSUSE:Factory and can be used now.
+- system-packages.diff: search for lua and mpg123 with pkg-config.
+
+-------------------------------------------------------------------
Old:
----
freetype.diff
love-remove-mpg123.patch
New:
----
system-packages.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ love-0_7_2.spec ++++++
--- /var/tmp/diff_new_pack.DdBWdr/_old 2017-08-29 11:48:14.521128652 +0200
+++ /var/tmp/diff_new_pack.DdBWdr/_new 2017-08-29 11:48:14.525128089 +0200
@@ -1,7 +1,7 @@
#
# spec file for package love-0_7_2
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -26,15 +26,13 @@
Source: https://bitbucket.org/rude/love/downloads/love-0.7.2-linux-src.tar.gz
Patch1: love-modplug.patch
-Patch2: love-remove-mpg123.patch
-Patch3: freetype.diff
+Patch2: system-packages.diff
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libmng-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
-BuildRequires: lua51-devel
BuildRequires: physfs-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(IL)
@@ -42,23 +40,21 @@
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(libmodplug)
+BuildRequires: pkgconfig(libmpg123)
+BuildRequires: pkgconfig(lua5.1)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(vorbisfile)
-%if %{with mpg123}
-BuildRequires: pkgconfig(libmpg123)
-%endif
%description
LÖVE is a framework for making 2D games in Lua.
%prep
%setup -qn love-HEAD
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -P 2 -p1
%build
sed -i 's/\r$//' *.txt
-rm -f src/modules/sound/lullaby/Mpg123Decoder.{cpp,h}
mv configure.{in,ac}
autoreconf -fi
%configure
++++++ system-packages.diff ++++++
From: Jan Engelhardt <jengelh(a)inai.de>
Date: 2015-01-20 20:46:39.043255730 +0100
build: löve uses an undocumented way of including freetype headers
Replace the (unsupported) #include <freetype/XX> paths by just <XX> as required
by upstream, and use pkg-config — not just for freetype, but also lua, and, by
extension, opportunistically for SDL/GL.
---
configure.in | 38 ++++++-------------------
src/Makefile.am | 7 +---
src/modules/font/freetype/Font.h | 8 ++---
src/modules/font/freetype/TrueTypeRasterizer.h | 8 ++---
4 files changed, 20 insertions(+), 41 deletions(-)
Index: love-HEAD/configure.in
===================================================================
--- love-HEAD.orig/configure.in
+++ love-HEAD/configure.in
@@ -3,42 +3,24 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([platform/unix])
AC_CONFIG_MACRO_DIR([platform/unix/m4])
AC_CONFIG_SRCDIR([src/love.cpp])
-AM_INIT_AUTOMAKE([foreign -Wall foreign tar-ustar])
+AM_INIT_AUTOMAKE([foreign -Wall foreign tar-ustar subdir-objects])
AC_PREFIX_DEFAULT([/usr])
AC_PROG_LIBTOOL
AC_PROG_CC
AC_PROG_CXX
AC_SEARCH_LIBS([sqrt], [m], [], AC_MSG_ERROR([Can't LÖVE without C math library]))
-AC_SEARCH_LIBS([SDL_Init], [SDL], [], AC_MSG_ERROR([Can't LÖVE without SDL]))
-AC_SEARCH_LIBS([glLoadIdentity], [GL], [], AC_MSG_ERROR([Can't LÖVE without OpenGL]))
-#AC_SEARCH_LIBS([gluOrtho2D], [GLU], [], AC_MSG_ERROR([Can't LÖVE without OpenGL Utility Library]))
-AC_SEARCH_LIBS([alSourcePlay], [openal], [], AC_MSG_ERROR([Can't LÖVE without OpenAL]))
-AC_ARG_ENABLE([luajit],
- [ --enable-luajit Use LuaJIT instead of lua],
- AC_SEARCH_LIBS(
- [lua_pcall],
- [luajit luajit-5.1],
- AC_SUBST([INCLUDE_LUA], [-I/usr/include/luajit-2.0]),
- AC_MSG_ERROR([Can't LÖVE without LuaJIT])
- ),
- AC_SEARCH_LIBS(
- [lua_pcall],
- [lua lua5.1],
- if test "$ac_cv_search_lua_pcall" = "-llua5.1"; then
- AC_SUBST([INCLUDE_LUA], [-I/usr/include/lua5.1])
- fi,
- AC_MSG_ERROR([Can't LÖVE without Lua])
- )
-)
-AC_SEARCH_LIBS([ilInit], [IL], [], AC_MSG_ERROR([Can't LÖVE without DevIL]))
+PKG_CHECK_MODULES([sdl], [sdl])
+PKG_CHECK_MODULES([gl], [gl])
+PKG_CHECK_MODULES([al], [openal])
+PKG_CHECK_MODULES([lua], [lua5.1])
+PKG_CHECK_MODULES([il], [IL])
AC_SEARCH_LIBS([mng_initialize], [mng], [], AC_MSG_ERROR([DevIL needs MNG]))
AC_SEARCH_LIBS([TIFFOpen], [tiff], [], AC_MSG_ERROR([DevIL needs TIFF]))
-AC_SEARCH_LIBS([FT_Load_Glyph], [freetype], [], AC_MSG_ERROR([Can't LÖVE without FreeType]))
+PKG_CHECK_MODULES([ft], [freetype2])
AC_SEARCH_LIBS([PHYSFS_init], [physfs], [], AC_MSG_ERROR([Can't LÖVE without PhysicsFS]))
-AC_SEARCH_LIBS([ModPlug_Load], [modplug], [], AC_MSG_ERROR([Can't LÖVE without ModPlug]))
-AC_SEARCH_LIBS([mpg123_open_feed], [mpg123], [], AC_MSG_ERROR([Can't LÖVE without Mpg123]))
-AC_SEARCH_LIBS([mpg123_seek_64], [mpg123], AC_SUBST([FILE_OFFSET],[-D_FILE_OFFSET_BITS=64]), AC_SUBST([FILE_OFFSET],[]))
-AC_SEARCH_LIBS([ov_open], [vorbisfile], [], AC_MSG_ERROR([Can't LÖVE without VorbisFile]))
+PKG_CHECK_MODULES([modplug], [libmodplug])
+PKG_CHECK_MODULES([mpg123], [libmpg123])
+PKG_CHECK_MODULES([vorbisfile], [vorbisfile])
AC_CONFIG_FILES([
Makefile
src/Makefile
Index: love-HEAD/src/Makefile.am
===================================================================
--- love-HEAD.orig/src/Makefile.am
+++ love-HEAD/src/Makefile.am
@@ -1,12 +1,9 @@
-AM_CPPFLAGS = -I. -I./modules -I/usr/include/AL -I/usr/include/freetype2 $(INCLUDE_LUA) -I/usr/include/SDL $(FILE_OFFSET)
-AUTOMAKE_OPTIONS = subdir-objects
-DEFAULT_INCLUDES =
+AM_CPPFLAGS = -I. -I./modules ${al_CFLAGS} ${ft_CFLAGS} ${gl_CFLAGS} ${glu_CFLAGS} ${il_CFLAGS} ${lua_CFLAGS} ${modplug_CFLAGS} ${mpg123_CFLAGS} ${sdl_CFLAGS} ${vorbisfile_CFLAGS} $(FILE_OFFSET)
SUBDIRS =
# LÖVE executable
bin_PROGRAMS = love
-#love_LDFLAGS =
-#love_LDADD =
+love_LDADD = ${al_LIBS} ${ft_LIBS} ${gl_LIBS} ${glu_LIBS} ${il_LIBS} ${lua_LIBS} ${modplug_LIBS} ${mpg123_LIBS} ${sdl_LIBS} ${vorbisfile_LIBS}
love_SOURCES = \
./scripts/graphics.lua.h \
Index: love-HEAD/src/modules/font/freetype/Font.h
===================================================================
--- love-HEAD.orig/src/modules/font/freetype/Font.h
+++ love-HEAD/src/modules/font/freetype/Font.h
@@ -30,10 +30,10 @@
#else
#include <ft2build.h>
#endif
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
namespace love
{
Index: love-HEAD/src/modules/font/freetype/TrueTypeRasterizer.h
===================================================================
--- love-HEAD.orig/src/modules/font/freetype/TrueTypeRasterizer.h
+++ love-HEAD/src/modules/font/freetype/TrueTypeRasterizer.h
@@ -27,10 +27,10 @@
// TrueType2
#include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
namespace love
{
1
0
Hello community,
here is the log from the commit of package python-EasyProcess for openSUSE:Factory checked in at 2017-08-29 11:47:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-EasyProcess (Old)
and /work/SRC/openSUSE:Factory/.python-EasyProcess.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-EasyProcess"
Tue Aug 29 11:47:05 2017 rev:12 rq:519240 version:0.2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-EasyProcess/python-EasyProcess.changes 2015-05-07 09:22:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-EasyProcess.new/python-EasyProcess.changes 2017-08-29 11:48:11.925494502 +0200
@@ -1,0 +2,8 @@
+Mon Aug 28 19:32:50 UTC 2017 - toddrme2178(a)gmail.com
+
+- update to version 0.2.3:
+ * no changelog available
+- Implement single-spec version
+- Fix source URL
+
+-------------------------------------------------------------------
Old:
----
EasyProcess-0.1.9.tar.gz
New:
----
EasyProcess-0.2.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-EasyProcess.spec ++++++
--- /var/tmp/diff_new_pack.TFJXq3/_old 2017-08-29 11:48:12.957349064 +0200
+++ /var/tmp/diff_new_pack.TFJXq3/_new 2017-08-29 11:48:12.957349064 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-EasyProcess
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,27 +16,32 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without test
Name: python-EasyProcess
-Version: 0.1.9
+Version: 0.2.3
Release: 0
Url: https://github.com/ponty/easyprocess
Summary: Easy to use python subprocess interface
License: BSD-2-Clause
Group: Development/Languages/Python
-Source: http://pypi.python.org/packages/source/E/EasyProcess/EasyProcess-%{version}…
-BuildRequires: python-devel
-BuildRequires: python-setuptools
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch: noarch
+Source: https://files.pythonhosted.org/packages/source/E/EasyProcess/EasyProcess-%{…
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
+BuildRequires: python3-2to3
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
+%if %{with test}
+BuildRequires: %{python_module nose}
%endif
+BuildArch: noarch
+
+%python_subpackages
%description
EasyProcess is an easy to use python subprocess interface.
-Features:
+Features include:
- layer on top of subprocess module
- easy to start, stop programs
- easy to get standard output/error, return code of programs
@@ -57,12 +62,23 @@
%setup -q -n EasyProcess-%{version}
%build
-python setup.py build
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
+
+%if %{with test}
+%check
+mkdir tester
+pushd tester
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
+$python -B -m nose easyprocess
+}
+popd
+%endif
-%files
+%files %{python_files}
%defattr(-,root,root,-)
%doc LICENSE.txt README.rst
%{python_sitelib}/*
++++++ EasyProcess-0.1.9.tar.gz -> EasyProcess-0.2.3.tar.gz ++++++
++++ 1669 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-PyAudio for openSUSE:Factory checked in at 2017-08-29 11:46:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyAudio (Old)
and /work/SRC/openSUSE:Factory/.python-PyAudio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyAudio"
Tue Aug 29 11:46:58 2017 rev:2 rq:519239 version:0.2.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PyAudio/python-PyAudio.changes 2015-10-20 00:04:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-PyAudio.new/python-PyAudio.changes 2017-08-29 11:48:10.249730698 +0200
@@ -1,0 +2,18 @@
+Mon Aug 28 20:43:35 UTC 2017 - toddrme2178(a)gmail.com
+
+- Update to 0.2.11
+ * Fix use-after-free memory issue in callback handler.
+ * Fix docstring for get_output_latency().
+- Update to 0.2.10
+ * Release the GIL during PortAudio I/O calls to avoid potential deadlock.
+ * Add a few automated unit tests.
+- Update to PyAudio 0.2.9
+ * Fix overflow error handling logic for pa_read_stream.
+ * Fix IOError arguments.
+ * Python library surfaces issues with importing low-level C module.
+ * Code formatting update.
+ * Updates to examples for Python 3 compatibility.
+- Implement single-spec version
+- Fix source URL
+
+-------------------------------------------------------------------
Old:
----
pyaudio-0.2.8.tar.gz
New:
----
PyAudio-0.2.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyAudio.spec ++++++
--- /var/tmp/diff_new_pack.UB51uE/_old 2017-08-29 11:48:11.757518178 +0200
+++ /var/tmp/diff_new_pack.UB51uE/_new 2017-08-29 11:48:11.773515924 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-PyAudio
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products 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,54 +16,61 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_with test
Name: python-PyAudio
-Version: 0.2.8
+Version: 0.2.11
Release: 0
Summary: Python Bindings for PortAudio v19
License: MIT
Group: Development/Libraries/Python
Url: http://people.csail.mit.edu/hubert/pyaudio/
-Source0: http://people.csail.mit.edu/hubert/pyaudio/packages/pyaudio-%{version}.tar.…
+Source: https://files.pythonhosted.org/packages/source/P/PyAudio/PyAudio-%{version}…
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: portaudio-devel
-BuildRequires: python-devel
-BuildRequires: python-setuptools
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: python-rpm-macros
+%if %{with test}
+BuildRequires: alsa
+BuildRequires: %{python_module nose}
+BuildRequires: %{python_module numpy}
+%endif
+
+%python_subpackages
%description
PyAudio provides Python bindings for PortAudio v19, the cross-platform audio I/O library.
With PyAudio, you can easily use Python to play and record audio streams on a variety
of platforms (e.g., GNU/Linux, Microsoft Windows, and Mac OS X).
-%package docs
-Summary: Documentation for %{name}
-Group: Development/Libraries/Python
-
-%description docs
-Documentation and help files for %{name}
-
%prep
%setup -q -n PyAudio-%{version}
%build
-python setup.py build
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
-%fdupes -s %{buildroot}/%{_prefix}
-rm -r docs/.doctrees
-rm -r docs/.buildinfo
+%if %{with test}
+%check
+pushd tests
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
+$python -B -m nose ./*.py
+}
+popd
+%endif
-%files
+%files %{python_files}
%defattr(-,root,root)
%doc CHANGELOG README
-%{python_sitearch}/_portaudio.so
+%doc examples/
+%{python_sitearch}/_portaudio*.so
%{python_sitearch}/pyaudio.py*
+%pycache_only %{python_sitearch}/__pycache__/pyaudio*.py*
%{python_sitearch}/PyAudio-%{version}-py*.egg-info
-%files docs
-%defattr(-,root,root)
-%doc docs
-
%changelog
1
0
Hello community,
here is the log from the commit of package platformsh-cli for openSUSE:Factory checked in at 2017-08-29 11:46:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old)
and /work/SRC/openSUSE:Factory/.platformsh-cli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "platformsh-cli"
Tue Aug 29 11:46:46 2017 rev:17 rq:519223 version:3.20.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes 2017-08-16 16:18:45.422907840 +0200
+++ /work/SRC/openSUSE:Factory/.platformsh-cli.new/platformsh-cli.changes 2017-08-29 11:48:06.394274119 +0200
@@ -1,0 +2,12 @@
+Mon Aug 28 20:20:01 UTC 2017 - jimmy(a)boombatower.com
+
+- Update to version 3.20.1:
+ * Easy install on Platform.sh environments
+ * No need to "source .environment"
+ * Write to tmp if config directory is not available
+ * Show ID of users (#618) (#619)
+ * Docs can no longer be searched by URL
+ * Use the local Drush if possible (#621)
+ * Release v3.20.1
+
+-------------------------------------------------------------------
Old:
----
platformsh-cli-3.20.0.tar.xz
New:
----
platformsh-cli-3.20.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ platformsh-cli.spec ++++++
--- /var/tmp/diff_new_pack.21QWg4/_old 2017-08-29 11:48:07.526114587 +0200
+++ /var/tmp/diff_new_pack.21QWg4/_new 2017-08-29 11:48:07.538112897 +0200
@@ -17,7 +17,7 @@
Name: platformsh-cli
-Version: 3.20.0
+Version: 3.20.1
Release: 0
Summary: Tool for managing Platform.sh services from the command line
# See licenses.txt for dependency licenses.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.21QWg4/_old 2017-08-29 11:48:07.682092602 +0200
+++ /var/tmp/diff_new_pack.21QWg4/_new 2017-08-29 11:48:07.686092039 +0200
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
- <param name="revision">refs/tags/v3.20.0</param>
+ <param name="revision">refs/tags/v3.20.1</param>
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.21QWg4/_old 2017-08-29 11:48:07.754082456 +0200
+++ /var/tmp/diff_new_pack.21QWg4/_new 2017-08-29 11:48:07.758081892 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
- <param name="changesrevision">48241718f7d61b41206871f8f0a13bea2e341181</param>
+ <param name="changesrevision">c113051c280d815807ee8125943571a33ced2158</param>
</service>
</servicedata>
++++++ platformsh-cli-3.20.0.tar.xz -> platformsh-cli-3.20.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/config.yaml new/platformsh-cli-3.20.1/config.yaml
--- old/platformsh-cli-3.20.0/config.yaml 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/config.yaml 2017-08-23 20:20:41.000000000 +0200
@@ -1,7 +1,7 @@
# Metadata about the CLI application itself.
application:
name: 'Platform.sh CLI'
- version: '3.20.0'
+ version: '3.20.1'
executable: 'platform'
package_name: 'platformsh/cli'
installer_url: 'https://platform.sh/cli/installer'
@@ -9,6 +9,7 @@
user_config_dir: '.platformsh'
user_state_file: '.platformsh/state.json'
env_prefix: 'PLATFORMSH_CLI_'
+ tmp_sub_dir: 'platformsh-cli-tmp'
# Configuration for working with projects locally.
local:
@@ -32,7 +33,7 @@
app_config_file: '.platform.app.yaml'
project_config_dir: '.platform'
docs_url: 'https://docs.platform.sh'
- docs_search_url: 'https://docs.platform.sh/?q={{ terms }}'
+ docs_search_url: 'https://www.google.com/search?q=site%3Adocs.platform.sh%20{{ terms }}'
accounts_url: 'https://accounts.platform.sh'
pricing_url: 'https://platform.sh/pricing'
available_regions:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/dist/installer.php new/platformsh-cli-3.20.1/dist/installer.php
--- old/platformsh-cli-3.20.0/dist/installer.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/dist/installer.php 2017-08-23 20:20:41.000000000 +0200
@@ -9,6 +9,7 @@
define('CLI_EXECUTABLE', 'platform');
define('CLI_NAME', 'Platform.sh CLI');
define('CLI_PHAR', CLI_EXECUTABLE . '.phar');
+define('CLI_SERVICE_ENV_PREFIX', 'PLATFORM_');
set_error_handler(
function ($code, $message) {
@@ -236,7 +237,7 @@
if ($shellConfigFile = findShellConfigFile($home)) {
output(" Configuring the shell...");
$configured = true;
- $currentShellConfig = file_get_contents($shellConfigFile);
+ $currentShellConfig = file_exists($shellConfigFile) ? file_get_contents($shellConfigFile) : false;
if ($currentShellConfig === false) {
$currentShellConfig = '';
}
@@ -264,7 +265,9 @@
if ($configured) {
output(PHP_EOL . "To get started, run:", 'info');
$toSource = getcwd() === $home ? str_replace(getcwd() . '/', '', $shellConfigFile) : $shellConfigFile;
- output(' source ' . $toSource);
+ if ($toSource !== '.environment') {
+ output(' source ' . $toSource);
+ }
output(' ' . CLI_EXECUTABLE);
} else {
output(PHP_EOL . "Add this to your shell configuration file:", 'info');
@@ -374,6 +377,13 @@
*/
function findShellConfigFile($home)
{
+ // Special handling for the .environment file on Platform.sh environments.
+ if (getenv(CLI_SERVICE_ENV_PREFIX . 'PROJECT') !== false
+ && getenv(CLI_SERVICE_ENV_PREFIX . 'APP_DIR') !== false
+ && getenv(CLI_SERVICE_ENV_PREFIX . 'APP_DIR') === $home) {
+ return getenv(CLI_SERVICE_ENV_PREFIX . 'APP_DIR') . '/.environment';
+ }
+
$candidates = array(
'.bash_profile',
'.bashrc',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/Auth/LogoutCommand.php new/platformsh-cli-3.20.1/src/Command/Auth/LogoutCommand.php
--- old/platformsh-cli-3.20.0/src/Command/Auth/LogoutCommand.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/Auth/LogoutCommand.php 2017-08-23 20:20:41.000000000 +0200
@@ -53,7 +53,7 @@
$this->stdErr->writeln('You are now logged out.');
$config = $this->config();
- $sessionsDir = $config->getUserConfigDir() . '/.session';
+ $sessionsDir = $config->getWritableUserDir() . '/.session';
if ($input->getOption('all')) {
if (is_dir($sessionsDir)) {
/** @var \Platformsh\Cli\Service\Filesystem $fs */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/MultiCommand.php new/platformsh-cli-3.20.1/src/Command/MultiCommand.php
--- old/platformsh-cli-3.20.0/src/Command/MultiCommand.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/MultiCommand.php 2017-08-23 20:20:41.000000000 +0200
@@ -120,7 +120,7 @@
}
$dialogRc = file_get_contents(CLI_ROOT . '/resources/console/dialogrc');
- $dialogRcFile = $this->config()->getUserConfigDir() . '/dialogrc';
+ $dialogRcFile = $this->config()->getWritableUserDir() . '/dialogrc';
if ($dialogRc !== false && (file_exists($dialogRcFile) || file_put_contents($dialogRcFile, $dialogRc))) {
putenv('DIALOGRC=' . $dialogRcFile);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/Server/ServerCommandBase.php new/platformsh-cli-3.20.1/src/Command/Server/ServerCommandBase.php
--- old/platformsh-cli-3.20.0/src/Command/Server/ServerCommandBase.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/Server/ServerCommandBase.php 2017-08-23 20:20:41.000000000 +0200
@@ -98,7 +98,7 @@
if (!isset($this->serverInfo)) {
$this->serverInfo = [];
// @todo move this to State service (in a new major version)
- $filename = $this->config()->getUserConfigDir() . '/local-servers.json';
+ $filename = $this->config()->getWritableUserDir() . '/local-servers.json';
if (file_exists($filename)) {
$this->serverInfo = (array) json_decode(file_get_contents($filename), true);
}
@@ -120,7 +120,7 @@
protected function saveServerInfo()
{
- $filename = $this->config()->getUserConfigDir() . '/local-servers.json';
+ $filename = $this->config()->getWritableUserDir() . '/local-servers.json';
if (!empty($this->serverInfo)) {
if (!file_put_contents($filename, json_encode($this->serverInfo))) {
throw new \RuntimeException('Failed to write server info to: ' . $filename);
@@ -206,7 +206,7 @@
*/
protected function getPidFile($address)
{
- return $this->config()->getUserConfigDir() . '/server-' . preg_replace('/\W+/', '-', $address) . '.pid';
+ return $this->config()->getWritableUserDir() . '/server-' . preg_replace('/\W+/', '-', $address) . '.pid';
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/Tunnel/TunnelCommandBase.php new/platformsh-cli-3.20.1/src/Command/Tunnel/TunnelCommandBase.php
--- old/platformsh-cli-3.20.0/src/Command/Tunnel/TunnelCommandBase.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/Tunnel/TunnelCommandBase.php 2017-08-23 20:20:41.000000000 +0200
@@ -68,7 +68,7 @@
if (!isset($this->tunnelInfo)) {
$this->tunnelInfo = [];
// @todo move this to State service (in a new major version)
- $filename = $this->config()->getUserConfigDir() . '/tunnel-info.json';
+ $filename = $this->config()->getWritableUserDir() . '/tunnel-info.json';
if (file_exists($filename)) {
$this->debug(sprintf('Loading tunnel info from %s', $filename));
$this->tunnelInfo = (array) json_decode(file_get_contents($filename), true);
@@ -97,7 +97,7 @@
protected function saveTunnelInfo()
{
- $filename = $this->config()->getUserConfigDir() . '/tunnel-info.json';
+ $filename = $this->config()->getWritableUserDir() . '/tunnel-info.json';
if (!empty($this->tunnelInfo)) {
$this->debug('Saving tunnel info to: ' . $filename);
if (!file_put_contents($filename, json_encode($this->tunnelInfo))) {
@@ -208,7 +208,7 @@
protected function getPidFile(array $tunnel)
{
$key = $this->getTunnelKey($tunnel);
- $dir = $this->config()->getUserConfigDir() . '/.tunnels';
+ $dir = $this->config()->getWritableUserDir() . '/.tunnels';
if (!is_dir($dir) && !mkdir($dir, 0700, true)) {
throw new \RuntimeException('Failed to create directory: ' . $dir);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/Tunnel/TunnelOpenCommand.php new/platformsh-cli-3.20.1/src/Command/Tunnel/TunnelOpenCommand.php
--- old/platformsh-cli-3.20.0/src/Command/Tunnel/TunnelOpenCommand.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/Tunnel/TunnelOpenCommand.php 2017-08-23 20:20:41.000000000 +0200
@@ -53,7 +53,7 @@
return 1;
}
- $logFile = $this->config()->getUserConfigDir() . '/tunnels.log';
+ $logFile = $this->config()->getWritableUserDir() . '/tunnels.log';
if (!$log = $this->openLog($logFile)) {
$this->stdErr->writeln(sprintf('Failed to open log file for writing: %s', $logFile));
return 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/User/UserListCommand.php new/platformsh-cli-3.20.1/src/Command/User/UserListCommand.php
--- old/platformsh-cli-3.20.0/src/Command/User/UserListCommand.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/User/UserListCommand.php 2017-08-23 20:20:41.000000000 +0200
@@ -39,12 +39,12 @@
$role .= ' (owner)';
}
}
- $rows[$weight] = [$account['email'], $account['display_name'], $role];
+ $rows[$weight] = [$account['email'], $account['display_name'], $role, $projectAccess->id];
}
ksort($rows);
- $table->render(array_values($rows), ['Email address', 'Name', 'Project role']);
+ $table->render(array_values($rows), ['Email address', 'Name', 'Project role', 'ID']);
return 0;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Service/Api.php new/platformsh-cli-3.20.1/src/Service/Api.php
--- old/platformsh-cli-3.20.0/src/Service/Api.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Service/Api.php 2017-08-23 20:20:41.000000000 +0200
@@ -186,7 +186,7 @@
// $HOME/.platformsh/.session/sess-cli-default/sess-cli-default.json
$session = $connector->getSession();
$session->setId('cli-' . $this->sessionId);
- $session->setStorage(new File($this->config->getUserConfigDir() . '/.session'));
+ $session->setStorage(new File($this->config->getWritableUserDir() . '/.session'));
self::$client = new PlatformClient($connector);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Service/CacheFactory.php new/platformsh-cli-3.20.1/src/Service/CacheFactory.php
--- old/platformsh-cli-3.20.0/src/Service/CacheFactory.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Service/CacheFactory.php 2017-08-23 20:20:41.000000000 +0200
@@ -20,7 +20,7 @@
}
return new FilesystemCache(
- $cliConfig->getUserConfigDir() . '/cache',
+ $cliConfig->getWritableUserDir() . '/cache',
FilesystemCache::EXTENSION,
0077 // Remove all permissions from the group and others.
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Service/Config.php new/platformsh-cli-3.20.1/src/Service/Config.php
--- old/platformsh-cli-3.20.0/src/Service/Config.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Service/Config.php 2017-08-23 20:20:41.000000000 +0200
@@ -70,6 +70,22 @@
}
/**
+ * @return string
+ */
+ public function getWritableUserDir()
+ {
+ $configDir = $this->getUserConfigDir();
+
+ // If the config directory is not writable (e.g. if we are on a
+ // Platform.sh environment), use a temporary directory instead.
+ if (!is_writable($configDir)) {
+ return sys_get_temp_dir() . '/' . $this->get('application.tmp_sub_dir');
+ }
+
+ return $configDir;
+ }
+
+ /**
* @param string $filename
*
* @return array
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Service/Drush.php new/platformsh-cli-3.20.1/src/Service/Drush.php
--- old/platformsh-cli-3.20.0/src/Service/Drush.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Service/Drush.php 2017-08-23 20:20:41.000000000 +0200
@@ -146,6 +146,20 @@
return $this->config->get('local.drush_executable');
}
+ // Find a locally installed Drush instance, either directly via Composer
+ // or indirectly via the local build dependencies.
+ if ($projectRoot = $this->localProject->getProjectRoot()) {
+ $drushLocal = $projectRoot . '/vendor/bin/drush';
+ if (is_executable($drushLocal)) {
+ return $drushLocal;
+ }
+
+ $drushDep = $projectRoot . '/' . $this->config->get('local.dependencies_dir') . '/php/vendor/bin/drush';
+ if (is_executable($drushDep)) {
+ return $drushDep;
+ }
+ }
+
return $this->shellHelper->resolveCommand('drush');
}
++++++ platformsh-cli-vendor.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/autoload.php new/vendor/autoload.php
--- old/vendor/autoload.php 2017-08-14 23:33:07.732611180 +0200
+++ new/vendor/autoload.php 2017-08-28 22:20:04.546440044 +0200
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitb6506811e4b3232d0fae5c2d61c458bc::getLoader();
+return ComposerAutoloaderInit43da8b7e837c7fede5b52ed96b8e8c7d::getLoader();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_real.php new/vendor/composer/autoload_real.php
--- old/vendor/composer/autoload_real.php 2017-08-14 23:33:07.732611180 +0200
+++ new/vendor/composer/autoload_real.php 2017-08-28 22:20:04.546440044 +0200
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitb6506811e4b3232d0fae5c2d61c458bc
+class ComposerAutoloaderInit43da8b7e837c7fede5b52ed96b8e8c7d
{
private static $loader;
@@ -19,15 +19,15 @@
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitb6506811e4b3232d0fae5c2d61c458bc', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit43da8b7e837c7fede5b52ed96b8e8c7d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitb6506811e4b3232d0fae5c2d61c458bc', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit43da8b7e837c7fede5b52ed96b8e8c7d', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequireb6506811e4b3232d0fae5c2d61c458bc($fileIdentifier, $file);
+ composerRequire43da8b7e837c7fede5b52ed96b8e8c7d($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequireb6506811e4b3232d0fae5c2d61c458bc($fileIdentifier, $file)
+function composerRequire43da8b7e837c7fede5b52ed96b8e8c7d($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_static.php new/vendor/composer/autoload_static.php
--- old/vendor/composer/autoload_static.php 2017-08-14 23:33:07.732611180 +0200
+++ new/vendor/composer/autoload_static.php 2017-08-28 22:20:04.546440044 +0200
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc
+class ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -183,9 +183,9 @@
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::$prefixDirsPsr4;
- $loader->classMap = ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::$prefixDirsPsr4;
+ $loader->classMap = ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::$classMap;
}, null, ClassLoader::class);
}
1
0
Hello community,
here is the log from the commit of package gnuhealth for openSUSE:Factory checked in at 2017-08-29 11:46:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnuhealth (Old)
and /work/SRC/openSUSE:Factory/.gnuhealth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuhealth"
Tue Aug 29 11:46:41 2017 rev:14 rq:519204 version:3.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnuhealth/gnuhealth.changes 2017-08-18 15:04:00.289527804 +0200
+++ /work/SRC/openSUSE:Factory/.gnuhealth.new/gnuhealth.changes 2017-08-29 11:48:04.250576270 +0200
@@ -1,0 +2,6 @@
+Mon Aug 28 19:29:06 UTC 2017 - axel.braun(a)gmx.de
+
+- version 3.2.2
+ health_imaging : Update health professional retrieval to the current standard method
+
+-------------------------------------------------------------------
Old:
----
gnuhealth-3.2.1.tar.gz
New:
----
gnuhealth-3.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnuhealth.spec ++++++
--- /var/tmp/diff_new_pack.6LH6Lv/_old 2017-08-29 11:48:05.446407719 +0200
+++ /var/tmp/diff_new_pack.6LH6Lv/_new 2017-08-29 11:48:05.462405465 +0200
@@ -24,7 +24,7 @@
BuildRequires: fdupes
BuildRequires: python3-setuptools
-Version: %{majorver}.1
+Version: %{majorver}.2
Release: 0
Url: http://health.gnu.org
++++++ _service ++++++
--- /var/tmp/diff_new_pack.6LH6Lv/_old 2017-08-29 11:48:05.570390244 +0200
+++ /var/tmp/diff_new_pack.6LH6Lv/_new 2017-08-29 11:48:05.570390244 +0200
@@ -1,4 +1,4 @@
<services>
-<service name="download_files" mode="disabled" />
+<service name="download_files" mode="localonly" />
</services>
++++++ gnuhealth-3.2.1.tar.gz -> gnuhealth-3.2.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/gnuhealth/gnuhealth-3.2.1.tar.gz /work/SRC/openSUSE:Factory/.gnuhealth.new/gnuhealth-3.2.2.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package cacti for openSUSE:Factory checked in at 2017-08-29 11:46:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cacti (Old)
and /work/SRC/openSUSE:Factory/.cacti.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti"
Tue Aug 29 11:46:35 2017 rev:2 rq:519189 version:1.1.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/cacti/cacti.changes 2017-08-22 11:08:42.236187493 +0200
+++ /work/SRC/openSUSE:Factory/.cacti.new/cacti.changes 2017-08-29 11:47:52.664209361 +0200
@@ -1,0 +2,27 @@
+Mon Aug 21 17:46:28 UTC 2017 - liedke(a)rz.uni-mannheim.de
+
+- Build version 1.1.19
+ issue#810: Scripts in packages don't match distribution
+ issue#919: Unable to upgrade to 1.1.18
+ issue: Update documentation for minimum PHP 5.4
+
+- Build version 1.1.18
+ issue#902: Correcting some issues with Console and External Links
+ issue#903: Upgrade pace.js to v0.7.8
+ issue#904: Allow user to hide Graphs from disabled Devices
+ issue#906: Create a separate Realm for Realtime Graphs
+ issue#907: XSS issue in spikekill.php
+ CVE-2017-12927 bsc#1054390
+ issue#910: Boost last run duration generates an error on new install
+ issue#914: Unable to purge Cacti logfile from System Utilities
+ issue#915: Non-numeric data in ss_host_disk.php
+ issue#916: Resolve display of errors when encountering ldap issues
+ issue#918: Minor XSS and create generalized escape function
+ CVE-2017-12978 bsc#1054742
+ issue: Resolve JavaScript errors on Login page
+ issue: Resolve JavaScript errors on Permission Denied pages
+ issue: Graphs tab would appear in non-classic even if you did not
+ have permissions
+ feature: Updated dutch translations
+
+-------------------------------------------------------------------
Old:
----
cacti-1.1.17.tar.gz
New:
----
cacti-1.1.19.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cacti.spec ++++++
--- /var/tmp/diff_new_pack.4o7Bhf/_old 2017-08-29 11:47:56.667645078 +0200
+++ /var/tmp/diff_new_pack.4o7Bhf/_new 2017-08-29 11:47:56.671644515 +0200
@@ -17,7 +17,7 @@
Name: cacti
-Version: 1.1.17
+Version: 1.1.19
Release: 0
Summary: Web Front-End to Monitor System Data via RRDtool
License: GPL-2.0+
++++++ cacti-1.1.17.tar.gz -> cacti-1.1.19.tar.gz ++++++
/work/SRC/openSUSE:Factory/cacti/cacti-1.1.17.tar.gz /work/SRC/openSUSE:Factory/.cacti.new/cacti-1.1.19.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package python-QtPy for openSUSE:Factory checked in at 2017-08-29 11:46:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-QtPy (Old)
and /work/SRC/openSUSE:Factory/.python-QtPy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-QtPy"
Tue Aug 29 11:46:28 2017 rev:2 rq:519187 version:1.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-QtPy/python-QtPy.changes 2017-05-27 13:14:38.791047599 +0200
+++ /work/SRC/openSUSE:Factory/.python-QtPy.new/python-QtPy.changes 2017-08-29 11:47:45.269251682 +0200
@@ -1,0 +2,34 @@
+Mon Aug 28 16:05:01 UTC 2017 - toddrme2178(a)gmail.com
+
+- Update to Version 1.3.1
+ + Bugs fixed
+ * Spurious cache files in PyPI tarball
+ * Importing qtpy should not raise exceptions
+ * No cache files included in the release tarball
+ * Remove Quantified Code badge because the service doesn't exist anymore
+ * Warn if QHeaderView deprecated methods are used
+- Update to Version 1.3
+ + New features
+ * Add support for PySide2
+ * Add support for QtMultimedia
+ * Add support for PyQt 4.6
+ + Bugs fixed
+ * Typo in readme title
+ * Update Readme for 1.3 release
+ * Add tests for untested modules
+ * Missing: QtOpenGL Module
+ * QDesktopServices split into QDesktopServices and QStandardPaths
+ * qInstallMessageHandler <-> qInstallMsgHandler
+ * Feature Request: PySide2 support
+ * Fix typo in Readme.
+ * Add compatibility for the rename of qInstallMsgHandler to qInstallMessageHandler
+ * Update Readme to reflect that we actually use the PySide2 layout
+ * Update Readme to mention that we now support PySide2.
+ * Add tests for Qtdesigner, QtNetwork, QtPrintSupport, QtSvg and QtTest.
+ * Follow QStandardPaths location in Qt5 for PyQt4/PySide
+ * Add a coveragerc file
+ * Add support for PyQt 4.6
+ * Add a new QtOpenGL module
+ * Add PySide2 support
+
+-------------------------------------------------------------------
Old:
----
QtPy-1.2.1.tar.gz
New:
----
QtPy-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-QtPy.spec ++++++
--- /var/tmp/diff_new_pack.UFTpnw/_old 2017-08-29 11:47:46.677053252 +0200
+++ /var/tmp/diff_new_pack.UFTpnw/_new 2017-08-29 11:47:46.697050433 +0200
@@ -15,11 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
-%bcond_without tests
+%bcond_without test
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-QtPy
-Version: 1.2.1
+Version: 1.3.1
Release: 0
License: MIT
Summary: Abstraction layer on top of Qt bindings
@@ -32,10 +32,13 @@
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module qt5}
BuildRequires: %{python_module sip}
+%if %{with test}
+BuildRequires: %{python_module pytest}
+%endif
Requires: python-qt5
Requires: python-sip
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
+
%python_subpackages
%description
@@ -50,15 +53,21 @@
%prep
%setup -q -n QtPy-%{version}
+sed -i 's/\r$//' LICENSE.txt
%build
%python_build
%install
%python_install
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%{python_expand chmod a+x %{buildroot}%{$python_sitelib}/qtpy/tests/runtests.py
+sed -i "s|^#!/usr/bin/env python$|#!%__$python|" %{buildroot}%{$python_sitelib}/qtpy/tests/runtests.py
+$python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/qtpy/tests/
+$python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/qtpy/tests/
+%fdupes %{buildroot}%{$python_sitelib}
+}
-%if %{with tests}
+%if %{with test}
%check
%python_exec setup.py test
%endif
++++++ QtPy-1.2.1.tar.gz -> QtPy-1.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/CHANGELOG.md new/QtPy-1.3.1/CHANGELOG.md
--- old/QtPy-1.2.1/CHANGELOG.md 2017-01-22 03:08:58.000000000 +0100
+++ new/QtPy-1.3.1/CHANGELOG.md 2017-08-21 18:45:03.000000000 +0200
@@ -1,5 +1,69 @@
# History of changes
+## Version 1.3.1 (2017-08-21)
+
+### Bugs fixed
+
+**Issues**
+
+* [Issue 129](https://github.com/spyder-ide/qtpy/issues/129) - Spurious cache files in PyPI tarball
+* [Issue 119](https://github.com/spyder-ide/qtpy/issues/119) - Importing qtpy should not raise exceptions
+
+In this release 2 issues were closed
+
+**Pull requests**
+
+* [PR 130](https://github.com/spyder-ide/qtpy/pull/130) - PR: No cache files included in the release tarball
+* [PR 126](https://github.com/spyder-ide/qtpy/pull/126) - PR: Remove Quantified Code badge because the service doesn't exist anymore
+* [PR 121](https://github.com/spyder-ide/qtpy/pull/121) - PR: Warn if QHeaderView deprecated methods are used
+
+In this release 3 pull requests were merged
+
+
+----
+
+
+## Version 1.3 (2017-08-12)
+
+### New features
+
+* Add support for PySide2
+* Add support for QtMultimedia
+* Add support for PyQt 4.6
+
+### Bugs fixed
+
+**Issues**
+
+* [Issue 124](https://github.com/spyder-ide/qtpy/issues/124) - Typo in readme title
+* [Issue 111](https://github.com/spyder-ide/qtpy/issues/111) - Update Readme for 1.3 release
+* [Issue 110](https://github.com/spyder-ide/qtpy/issues/110) - Add tests for untested modules
+* [Issue 101](https://github.com/spyder-ide/qtpy/issues/101) - Missing: QtOpenGL Module
+* [Issue 89](https://github.com/spyder-ide/qtpy/issues/89) - QDesktopServices split into QDesktopServices and QStandardPaths
+* [Issue 57](https://github.com/spyder-ide/qtpy/issues/57) - qInstallMessageHandler <-> qInstallMsgHandler
+* [Issue 15](https://github.com/spyder-ide/qtpy/issues/15) - Feature Request: PySide2 support
+
+In this release 7 issues were closed
+
+**Pull requests**
+
+* [PR 125](https://github.com/spyder-ide/qtpy/pull/125) - PR: Fix typo in Readme.
+* [PR 117](https://github.com/spyder-ide/qtpy/pull/117) - PR: Add compatibility for the rename of qInstallMsgHandler to qInstallMessageHandler
+* [PR 115](https://github.com/spyder-ide/qtpy/pull/115) - PR: Update Readme to reflect that we actually use the PySide2 layout
+* [PR 114](https://github.com/spyder-ide/qtpy/pull/114) - PR: Update Readme to mention that we now support PySide2.
+* [PR 113](https://github.com/spyder-ide/qtpy/pull/113) - PR: Add tests for Qtdesigner, QtNetwork, QtPrintSupport, QtSvg and QtTest.
+* [PR 112](https://github.com/spyder-ide/qtpy/pull/112) - PR: Follow QStandardPaths location in Qt5 for PyQt4/PySide
+* [PR 109](https://github.com/spyder-ide/qtpy/pull/109) - PR: Add a coveragerc file
+* [PR 106](https://github.com/spyder-ide/qtpy/pull/106) - PR: Add support for PyQt 4.6
+* [PR 102](https://github.com/spyder-ide/qtpy/pull/102) - PR: Add a new QtOpenGL module
+* [PR 84](https://github.com/spyder-ide/qtpy/pull/84) - PR: Add PySide2 support
+
+In this release 10 pull requests were merged
+
+
+----
+
+
## Version 1.2.1 (2017/01/21)
### Bugs fixed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/MANIFEST.in new/QtPy-1.3.1/MANIFEST.in
--- old/QtPy-1.2.1/MANIFEST.in 2017-01-22 03:05:55.000000000 +0100
+++ new/QtPy-1.3.1/MANIFEST.in 2017-08-21 18:38:49.000000000 +0200
@@ -2,4 +2,4 @@
include CHANGELOG.md
include LICENSE.txt
include README.md
-recursive-include qtpy/tests *
+recursive-include qtpy/tests *.py *.ui
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/PKG-INFO new/QtPy-1.3.1/PKG-INFO
--- old/QtPy-1.2.1/PKG-INFO 2017-01-22 03:10:28.000000000 +0100
+++ new/QtPy-1.3.1/PKG-INFO 2017-08-21 18:47:29.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: QtPy
-Version: 1.2.1
+Version: 1.3.1
Summary: Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets.
Home-page: https://github.com/spyder-ide/qtpy
Author: Gonzalo Peña-Castellanos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/QtPy.egg-info/PKG-INFO new/QtPy-1.3.1/QtPy.egg-info/PKG-INFO
--- old/QtPy-1.2.1/QtPy.egg-info/PKG-INFO 2017-01-22 03:10:27.000000000 +0100
+++ new/QtPy-1.3.1/QtPy.egg-info/PKG-INFO 2017-08-21 18:47:28.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: QtPy
-Version: 1.2.1
+Version: 1.3.1
Summary: Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets.
Home-page: https://github.com/spyder-ide/qtpy
Author: Gonzalo Peña-Castellanos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/QtPy.egg-info/SOURCES.txt new/QtPy-1.3.1/QtPy.egg-info/SOURCES.txt
--- old/QtPy-1.2.1/QtPy.egg-info/SOURCES.txt 2017-01-22 03:10:28.000000000 +0100
+++ new/QtPy-1.3.1/QtPy.egg-info/SOURCES.txt 2017-08-21 18:47:29.000000000 +0200
@@ -14,6 +14,7 @@
qtpy/QtGui.py
qtpy/QtMultimedia.py
qtpy/QtNetwork.py
+qtpy/QtOpenGL.py
qtpy/QtPrintSupport.py
qtpy/QtSvg.py
qtpy/QtTest.py
@@ -27,6 +28,7 @@
qtpy/_patch/__init__.py
qtpy/_patch/qcombobox.py
qtpy/_patch/qheaderview.py
+qtpy/tests/__init__.py
qtpy/tests/conftest.py
qtpy/tests/runtests.py
qtpy/tests/test.ui
@@ -34,10 +36,12 @@
qtpy/tests/test_main.py
qtpy/tests/test_patch_qcombobox.py
qtpy/tests/test_patch_qheaderview.py
+qtpy/tests/test_qdesktopservice_split.py
+qtpy/tests/test_qtcore.py
+qtpy/tests/test_qtdesigner.py
qtpy/tests/test_qtmultimedia.py
-qtpy/tests/test_uic.py
-qtpy/tests/__pycache__/conftest.cpython-35.pyc
-qtpy/tests/__pycache__/test_main.cpython-35-PYTEST.pyc
-qtpy/tests/__pycache__/test_patch_qcombobox.cpython-35-PYTEST.pyc
-qtpy/tests/__pycache__/test_qtmultimedia.cpython-35-PYTEST.pyc
-qtpy/tests/__pycache__/test_uic.cpython-35-PYTEST.pyc
\ No newline at end of file
+qtpy/tests/test_qtnetwork.py
+qtpy/tests/test_qtprintsupport.py
+qtpy/tests/test_qtsvg.py
+qtpy/tests/test_qttest.py
+qtpy/tests/test_uic.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/README.md new/QtPy-1.3.1/README.md
--- old/QtPy-1.2.1/README.md 2017-01-22 03:07:05.000000000 +0100
+++ new/QtPy-1.3.1/README.md 2017-08-12 17:45:55.000000000 +0200
@@ -1,4 +1,4 @@
-# QtPy: Abtraction layer for PyQt5/PyQt4/PySide
+# QtPy: Abstraction layer for PyQt5/PyQt4/PySide2/PySide
Copyright © 2009- The Spyder Development Team.
@@ -11,7 +11,6 @@
[![Build status](https://ci.appveyor.com/api/projects/status/62y6i02vhn4hefg0/branch…
[![CircleCI](https://circleci.com/gh/spyder-ide/qtpy.svg?style=shield)](https://circleci.com/gh/spyder-ide/qtpy)
[![Coverage Status](https://coveralls.io/repos/github/spyder-ide/qtpy/badge.svg?branch=master)](https://coveralls.io/github/spyder-ide/qtpy?branch=master)
-[![Code Issues](https://www.quantifiedcode.com/api/v1/project/c769241c7d7f4463b1e6f…
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/spyder-ide/qtpy/badges/quality-score.…
## Description
@@ -19,11 +18,11 @@
**QtPy** is a small abstraction layer that lets you
write applications using a single API call to either PyQt or PySide.
-It provides support for PyQt5, PyQt4 and PySide using the PyQt5 layout (where
-the QtGui module has been split into QtGui and QtWidgets).
+It provides support for PyQt5, PyQt4, PySide2 and PySide using the Qt5 layout
+(where the QtGui module has been split into QtGui and QtWidgets).
-Basically, you write your code as if you were using PyQt5 but import Qt modules
-from `qtpy` instead of `PyQt5`.
+Basically, you write your code as if you were using PySide2 but import Qt modules
+from `qtpy` instead of `PySide2` (or `PyQt5`)
### Attribution and acknowledgements
@@ -46,7 +45,7 @@
### Requirements
-You need PyQt5, PyQt4 or PySide installed in your system to make use
+You need PyQt5, PyQt4, PySide2 or PySide installed in your system to make use
of QtPy. If several of these packages are found, PyQt5 is used by
default unless you set the `QT_API` environment variable.
@@ -54,6 +53,7 @@
* `pyqt5` (to use PyQt5).
* `pyqt` or `pyqt4` (to use PyQt4).
+* `pyside2` (to use PySide2)
* `pyside` (to use PySide).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtCore.py new/QtPy-1.3.1/qtpy/QtCore.py
--- old/QtPy-1.2.1/qtpy/QtCore.py 2017-01-02 23:05:09.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtCore.py 2017-08-12 17:19:03.000000000 +0200
@@ -10,7 +10,7 @@
Provides QtCore classes and functions.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYSIDE2, PYQT4, PYSIDE, PythonQtError
if PYQT5:
@@ -22,6 +22,8 @@
# Those are imported from `import *`
del pyqtSignal, pyqtSlot, pyqtProperty, QT_VERSION_STR
+elif PYSIDE2:
+ from PySide2.QtCore import *
elif PYQT4:
from PyQt4.QtCore import *
# Those are things we inherited from Spyder that fix crazy crashes under
@@ -35,14 +37,58 @@
QItemSelectionRange, QSortFilterProxyModel,
QStringListModel)
from PyQt4.QtCore import QT_VERSION_STR as __version__
+ from PyQt4.QtCore import qInstallMsgHandler as qInstallMessageHandler
+
+ # QDesktopServices has has been split into (QDesktopServices and
+ # QStandardPaths) in Qt5
+ # This creates a dummy class that emulates QStandardPaths
+ from PyQt4.QtGui import QDesktopServices as _QDesktopServices
+
+ class QStandardPaths():
+ StandardLocation = _QDesktopServices.StandardLocation
+ displayName = _QDesktopServices.displayName
+ DesktopLocation = _QDesktopServices.DesktopLocation
+ DocumentsLocation = _QDesktopServices.DocumentsLocation
+ FontsLocation = _QDesktopServices.FontsLocation
+ ApplicationsLocation = _QDesktopServices.ApplicationsLocation
+ MusicLocation = _QDesktopServices.MusicLocation
+ MoviesLocation = _QDesktopServices.MoviesLocation
+ PicturesLocation = _QDesktopServices.PicturesLocation
+ TempLocation = _QDesktopServices.TempLocation
+ HomeLocation = _QDesktopServices.HomeLocation
+ DataLocation = _QDesktopServices.DataLocation
+ CacheLocation = _QDesktopServices.CacheLocation
# Those are imported from `import *`
- del pyqtSignal, pyqtSlot, pyqtProperty, QT_VERSION_STR
+ del pyqtSignal, pyqtSlot, pyqtProperty, QT_VERSION_STR, qInstallMsgHandler
elif PYSIDE:
from PySide.QtCore import *
from PySide.QtGui import (QItemSelection, QItemSelectionModel,
QItemSelectionRange, QSortFilterProxyModel,
QStringListModel)
+ from PySide.QtCore import qInstallMsgHandler as qInstallMessageHandler
+ del qInstallMsgHandler
+
+ # QDesktopServices has has been split into (QDesktopServices and
+ # QStandardPaths) in Qt5
+ # This creates a dummy class that emulates QStandardPaths
+ from PySide.QtGui import QDesktopServices as _QDesktopServices
+
+ class QStandardPaths():
+ StandardLocation = _QDesktopServices.StandardLocation
+ displayName = _QDesktopServices.displayName
+ DesktopLocation = _QDesktopServices.DesktopLocation
+ DocumentsLocation = _QDesktopServices.DocumentsLocation
+ FontsLocation = _QDesktopServices.FontsLocation
+ ApplicationsLocation = _QDesktopServices.ApplicationsLocation
+ MusicLocation = _QDesktopServices.MusicLocation
+ MoviesLocation = _QDesktopServices.MoviesLocation
+ PicturesLocation = _QDesktopServices.PicturesLocation
+ TempLocation = _QDesktopServices.TempLocation
+ HomeLocation = _QDesktopServices.HomeLocation
+ DataLocation = _QDesktopServices.DataLocation
+ CacheLocation = _QDesktopServices.CacheLocation
+
import PySide.QtCore
__version__ = PySide.QtCore.__version__
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtGui.py new/QtPy-1.3.1/qtpy/QtGui.py
--- old/QtPy-1.2.1/qtpy/QtGui.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtGui.py 2017-05-11 17:36:04.000000000 +0200
@@ -13,36 +13,46 @@
the ``PyQt5.QtGui`` module.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYQT4, PYSIDE, PYSIDE2, PythonQtError
if PYQT5:
from PyQt5.QtGui import *
+elif PYSIDE2:
+ from PySide2.QtGui import *
elif PYQT4:
+ try:
+ # Older versions of PyQt4 do not provide these
+ from PyQt4.QtGui import (QGlyphRun, QMatrix2x2, QMatrix2x3,
+ QMatrix2x4, QMatrix3x2, QMatrix3x3,
+ QMatrix3x4, QMatrix4x2, QMatrix4x3,
+ QMatrix4x4, QTouchEvent, QQuaternion,
+ QRadialGradient, QRawFont, QStaticText,
+ QVector2D, QVector3D, QVector4D,
+ qFuzzyCompare)
+ except ImportError:
+ pass
from PyQt4.Qt import QKeySequence, QTextCursor
from PyQt4.QtGui import (QAbstractTextDocumentLayout, QActionEvent, QBitmap,
QBrush, QClipboard, QCloseEvent, QColor,
QConicalGradient, QContextMenuEvent, QCursor,
- QDesktopServices, QDoubleValidator, QDrag,
+ QDoubleValidator, QDrag,
QDragEnterEvent, QDragLeaveEvent, QDragMoveEvent,
QDropEvent, QFileOpenEvent, QFocusEvent, QFont,
QFontDatabase, QFontInfo, QFontMetrics,
- QFontMetricsF, QGlyphRun, QGradient, QHelpEvent,
+ QFontMetricsF, QGradient, QHelpEvent,
QHideEvent, QHoverEvent, QIcon, QIconDragEvent,
QIconEngine, QImage, QImageIOHandler, QImageReader,
QImageWriter, QInputEvent, QInputMethodEvent,
QKeyEvent, QLinearGradient,
- QMatrix2x2, QMatrix2x3, QMatrix2x4, QMatrix3x2,
- QMatrix3x3, QMatrix3x4, QMatrix4x2, QMatrix4x3,
- QMatrix4x4, QMouseEvent, QMoveEvent, QMovie,
+ QMouseEvent, QMoveEvent, QMovie,
QPaintDevice, QPaintEngine, QPaintEngineState,
QPaintEvent, QPainter, QPainterPath,
QPainterPathStroker, QPalette, QPen, QPicture,
QPictureIO, QPixmap, QPixmapCache, QPolygon,
- QPolygonF, QQuaternion, QRadialGradient, QRawFont,
- QRegExpValidator, QRegion, QResizeEvent,
+ QPolygonF, QRegExpValidator, QRegion, QResizeEvent,
QSessionManager, QShortcutEvent, QShowEvent,
- QStandardItem, QStandardItemModel, QStaticText,
+ QStandardItem, QStandardItemModel,
QStatusTipEvent, QSyntaxHighlighter, QTabletEvent,
QTextBlock, QTextBlockFormat, QTextBlockGroup,
QTextBlockUserData, QTextCharFormat,
@@ -53,17 +63,28 @@
QTextLength, QTextLine, QTextList, QTextListFormat,
QTextObject, QTextObjectInterface, QTextOption,
QTextTable, QTextTableCell, QTextTableCellFormat,
- QTextTableFormat, QTouchEvent, QTransform,
- QValidator, QVector2D, QVector3D, QVector4D,
- QWhatsThisClickedEvent, QWheelEvent,
+ QTextTableFormat, QTransform,
+ QValidator, QWhatsThisClickedEvent, QWheelEvent,
QWindowStateChangeEvent, qAlpha, qBlue,
- qFuzzyCompare, qGray, qGreen, qIsGray, qRed, qRgb,
+ qGray, qGreen, qIsGray, qRed, qRgb,
qRgba, QIntValidator)
+
+ # QDesktopServices has has been split into (QDesktopServices and
+ # QStandardPaths) in Qt5
+ # It only exposes QDesktopServices that are still in pyqt5
+ from PyQt4.QtGui import QDesktopServices as _QDesktopServices
+
+ class QDesktopServices():
+ openUrl = _QDesktopServices.openUrl
+ setUrlHandler = _QDesktopServices.setUrlHandler
+ unsetUrlHandler = _QDesktopServices.unsetUrlHandler
+
+
elif PYSIDE:
from PySide.QtGui import (QAbstractTextDocumentLayout, QActionEvent, QBitmap,
QBrush, QClipboard, QCloseEvent, QColor,
QConicalGradient, QContextMenuEvent, QCursor,
- QDesktopServices, QDoubleValidator, QDrag,
+ QDoubleValidator, QDrag,
QDragEnterEvent, QDragLeaveEvent, QDragMoveEvent,
QDropEvent, QFileOpenEvent, QFocusEvent, QFont,
QFontDatabase, QFontInfo, QFontMetrics,
@@ -99,5 +120,14 @@
QWindowStateChangeEvent, qAlpha, qBlue,
qGray, qGreen, qIsGray, qRed, qRgb, qRgba,
QIntValidator)
+ # QDesktopServices has has been split into (QDesktopServices and
+ # QStandardPaths) in Qt5
+ # It only exposes QDesktopServices that are still in pyqt5
+ from PySide.QtGui import QDesktopServices as _QDesktopServices
+
+ class QDesktopServices():
+ openUrl = _QDesktopServices.openUrl
+ setUrlHandler = _QDesktopServices.setUrlHandler
+ unsetUrlHandler = _QDesktopServices.unsetUrlHandler
else:
raise PythonQtError('No Qt bindings could be found')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtMultimedia.py new/QtPy-1.3.1/qtpy/QtMultimedia.py
--- old/QtPy-1.2.1/qtpy/QtMultimedia.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtMultimedia.py 2017-05-11 17:36:04.000000000 +0200
@@ -1,10 +1,15 @@
from . import PYQT5
from . import PYQT4
from . import PYSIDE
+from . import PYSIDE2
if PYQT5:
from PyQt5.QtMultimedia import *
+elif PYSIDE2:
+ # Current wheels don't have this module
+ # from PySide2.QtMultimedia import *
+ pass
elif PYQT4:
from PyQt4.QtMultimedia import *
from PyQt4.QtGui import QSound
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtNetwork.py new/QtPy-1.3.1/qtpy/QtNetwork.py
--- old/QtPy-1.2.1/qtpy/QtNetwork.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtNetwork.py 2017-05-11 17:36:04.000000000 +0200
@@ -10,11 +10,13 @@
Provides QtNetwork classes and functions.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYSIDE2, PYQT4, PYSIDE, PythonQtError
if PYQT5:
from PyQt5.QtNetwork import *
+elif PYSIDE2:
+ from PySide2.QtNetwork import *
elif PYQT4:
from PyQt4.QtNetwork import *
elif PYSIDE:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtOpenGL.py new/QtPy-1.3.1/qtpy/QtOpenGL.py
--- old/QtPy-1.2.1/qtpy/QtOpenGL.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtOpenGL.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © 2009- The Spyder Development Team
+#
+# Licensed under the terms of the MIT License
+# (see LICENSE.txt for details)
+# -----------------------------------------------------------------------------
+"""Provides QtOpenGL classes and functions."""
+
+# Local imports
+from . import PYQT4, PYQT5, PYSIDE, PythonQtError
+
+if PYQT5:
+ from PyQt5.QtOpenGL import *
+elif PYQT4:
+ from PyQt4.QtOpenGL import *
+elif PYSIDE:
+ from PySide.QtOpenGL import *
+else:
+ raise PythonQtError('No Qt bindings could be found')
+
+del PYQT4, PYQT5, PYSIDE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtPrintSupport.py new/QtPy-1.3.1/qtpy/QtPrintSupport.py
--- old/QtPy-1.2.1/qtpy/QtPrintSupport.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtPrintSupport.py 2017-05-11 17:36:04.000000000 +0200
@@ -9,11 +9,13 @@
Provides QtPrintSupport classes and functions.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYQT4,PYSIDE2, PYSIDE, PythonQtError
if PYQT5:
from PyQt5.QtPrintSupport import *
+elif PYSIDE2:
+ from PySide2.QtPrintSupport import *
elif PYQT4:
from PyQt4.QtGui import (QAbstractPrintDialog, QPageSetupDialog,
QPrintDialog, QPrintEngine, QPrintPreviewDialog,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtSvg.py new/QtPy-1.3.1/qtpy/QtSvg.py
--- old/QtPy-1.2.1/qtpy/QtSvg.py 2017-01-02 22:17:23.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtSvg.py 2017-05-11 17:36:04.000000000 +0200
@@ -8,10 +8,12 @@
"""Provides QtSvg classes and functions."""
# Local imports
-from . import PYQT4, PYQT5, PYSIDE, PythonQtError
+from . import PYQT4, PYSIDE2, PYQT5, PYSIDE, PythonQtError
if PYQT5:
from PyQt5.QtSvg import *
+elif PYSIDE2:
+ from PySide2.QtSvg import *
elif PYQT4:
from PyQt4.QtSvg import *
elif PYSIDE:
@@ -19,4 +21,4 @@
else:
raise PythonQtError('No Qt bindings could be found')
-del PYQT4, PYQT5, PYSIDE
+del PYQT4, PYQT5, PYSIDE, PYSIDE2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtTest.py new/QtPy-1.3.1/qtpy/QtTest.py
--- old/QtPy-1.2.1/qtpy/QtTest.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtTest.py 2017-05-11 17:36:04.000000000 +0200
@@ -10,11 +10,13 @@
Provides QtTest and functions
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5,PYSIDE2, PYQT4, PYSIDE, PythonQtError
if PYQT5:
from PyQt5.QtTest import QTest
+elif PYSIDE2:
+ from PySide2.QtTest import QTest
elif PYQT4:
from PyQt4.QtTest import QTest as OldQTest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtWebEngineWidgets.py new/QtPy-1.3.1/qtpy/QtWebEngineWidgets.py
--- old/QtPy-1.2.1/qtpy/QtWebEngineWidgets.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtWebEngineWidgets.py 2017-05-11 17:36:04.000000000 +0200
@@ -10,7 +10,7 @@
Provides QtWebEngineWidgets classes and functions.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5,PYSIDE2, PYQT4, PYSIDE, PythonQtError
# To test if we are using WebEngine or WebKit
@@ -27,6 +27,18 @@
from PyQt5.QtWebKitWidgets import QWebView as QWebEngineView
from PyQt5.QtWebKit import QWebSettings as QWebEngineSettings
WEBENGINE = False
+elif PYSIDE2:
+ try:
+ from PySide2.QtWebEngineWidgets import QWebEnginePage
+ from PySide2.QtWebEngineWidgets import QWebEngineView
+ # Current PySide2 wheels seem to be missing this.
+ # from PySide2.QtWebEngineWidgets import QWebEngineSettings
+ except ImportError:
+ from PySide2.QtWebKitWidgets import QWebPage as QWebEnginePage
+ from PySide2.QtWebKitWidgets import QWebView as QWebEngineView
+ # Current PySide2 wheels seem to be missing this.
+ # from PySide2.QtWebKit import QWebSettings as QWebEngineSettings
+ WEBENGINE = False
elif PYQT4:
from PyQt4.QtWebKit import QWebPage as QWebEnginePage
from PyQt4.QtWebKit import QWebView as QWebEngineView
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtWidgets.py new/QtPy-1.3.1/qtpy/QtWidgets.py
--- old/QtPy-1.2.1/qtpy/QtWidgets.py 2017-01-02 23:05:09.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtWidgets.py 2017-05-11 17:36:04.000000000 +0200
@@ -13,36 +13,46 @@
were the ``PyQt5.QtWidgets`` module.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYSIDE2, PYQT4, PYSIDE, PythonQtError
from ._patch.qcombobox import patch_qcombobox
from ._patch.qheaderview import introduce_renamed_methods_qheaderview
if PYQT5:
from PyQt5.QtWidgets import *
+elif PYSIDE2:
+ from PySide2.QtWidgets import *
elif PYQT4:
from PyQt4.QtGui import *
QStyleOptionViewItem = QStyleOptionViewItemV4
del QStyleOptionViewItemV4
# These objects belong to QtGui
+ try:
+ # Older versions of PyQt4 do not provide these
+ del (QGlyphRun,
+ QMatrix2x2, QMatrix2x3, QMatrix2x4, QMatrix3x2, QMatrix3x3,
+ QMatrix3x4, QMatrix4x2, QMatrix4x3, QMatrix4x4,
+ QQuaternion, QRadialGradient, QRawFont, QRegExpValidator,
+ QStaticText, QTouchEvent, QVector2D, QVector3D, QVector4D,
+ qFuzzyCompare)
+ except NameError:
+ pass
del (QAbstractTextDocumentLayout, QActionEvent, QBitmap, QBrush, QClipboard,
QCloseEvent, QColor, QConicalGradient, QContextMenuEvent, QCursor,
QDesktopServices, QDoubleValidator, QDrag, QDragEnterEvent,
QDragLeaveEvent, QDragMoveEvent, QDropEvent, QFileOpenEvent,
QFocusEvent, QFont, QFontDatabase, QFontInfo, QFontMetrics,
- QFontMetricsF, QGlyphRun, QGradient, QHelpEvent, QHideEvent,
+ QFontMetricsF, QGradient, QHelpEvent, QHideEvent,
QHoverEvent, QIcon, QIconDragEvent, QIconEngine, QImage,
QImageIOHandler, QImageReader, QImageWriter, QInputEvent,
QInputMethodEvent, QKeyEvent, QKeySequence, QLinearGradient,
- QMatrix2x2, QMatrix2x3, QMatrix2x4, QMatrix3x2, QMatrix3x3,
- QMatrix3x4, QMatrix4x2, QMatrix4x3, QMatrix4x4, QMouseEvent,
- QMoveEvent, QMovie, QPaintDevice, QPaintEngine, QPaintEngineState,
- QPaintEvent, QPainter, QPainterPath, QPainterPathStroker, QPalette,
- QPen, QPicture, QPictureIO, QPixmap, QPixmapCache, QPolygon,
- QPolygonF, QQuaternion, QRadialGradient, QRawFont, QRegExpValidator,
+ QMouseEvent, QMoveEvent, QMovie, QPaintDevice, QPaintEngine,
+ QPaintEngineState, QPaintEvent, QPainter, QPainterPath,
+ QPainterPathStroker, QPalette, QPen, QPicture, QPictureIO, QPixmap,
+ QPixmapCache, QPolygon, QPolygonF,
QRegion, QResizeEvent, QSessionManager, QShortcutEvent, QShowEvent,
- QStandardItem, QStandardItemModel, QStaticText, QStatusTipEvent,
+ QStandardItem, QStandardItemModel, QStatusTipEvent,
QSyntaxHighlighter, QTabletEvent, QTextBlock, QTextBlockFormat,
QTextBlockGroup, QTextBlockUserData, QTextCharFormat, QTextCursor,
QTextDocument, QTextDocumentFragment, QTextDocumentWriter,
@@ -50,9 +60,9 @@
QTextImageFormat, QTextInlineObject, QTextItem, QTextLayout,
QTextLength, QTextLine, QTextList, QTextListFormat, QTextObject,
QTextObjectInterface, QTextOption, QTextTable, QTextTableCell,
- QTextTableCellFormat, QTextTableFormat, QTouchEvent, QTransform,
- QValidator, QVector2D, QVector3D, QVector4D, QWhatsThisClickedEvent,
- QWheelEvent, QWindowStateChangeEvent, qAlpha, qBlue, qFuzzyCompare,
+ QTextTableCellFormat, QTextTableFormat, QTransform,
+ QValidator, QWhatsThisClickedEvent,
+ QWheelEvent, QWindowStateChangeEvent, qAlpha, qBlue,
qGray, qGreen, qIsGray, qRed, qRgb, qRgba, QIntValidator,
QStringListModel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/__init__.py new/QtPy-1.3.1/qtpy/__init__.py
--- old/QtPy-1.2.1/qtpy/__init__.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/__init__.py 2017-05-11 17:36:04.000000000 +0200
@@ -26,6 +26,17 @@
>>> print(QtWidgets.QWidget)
+PySide2
+======
+
+Set the QT_API environment variable to 'pyside2' before importing other
+packages::
+
+ >>> import os
+ >>> os.environ['QT_API'] = 'pyside2'
+ >>> from qtpy import QtGui, QtWidgets, QtCore
+ >>> print(QtWidgets.QWidget)
+
PyQt4
=====
@@ -55,25 +66,32 @@
# Version of QtPy
from ._version import __version__
-#: Qt API environment variable name
+# Qt API environment variable name
QT_API = 'QT_API'
-#: names of the expected PyQt5 api
+
+# Names of the expected PyQt5 api
PYQT5_API = ['pyqt5']
-#: names of the expected PyQt4 api
+
+# Names of the expected PyQt4 api
PYQT4_API = [
'pyqt', # name used in IPython.qt
'pyqt4' # pyqode.qt original name
]
-#: names of the expected PySide api
+
+# Names of the expected PySide api
PYSIDE_API = ['pyside']
+# Names of the expected PySide2 api
+PYSIDE2_API = ['pyside2']
+
+# Setting a default value for QT_API
os.environ.setdefault(QT_API, 'pyqt5')
API = os.environ[QT_API].lower()
-assert API in (PYQT5_API + PYQT4_API + PYSIDE_API)
+assert API in (PYQT5_API + PYQT4_API + PYSIDE_API + PYSIDE2_API)
is_old_pyqt = is_pyqt46 = False
PYQT5 = True
-PYQT4 = PYSIDE = False
+PYQT4 = PYSIDE = PYSIDE2 = False
class PythonQtError(Exception):
@@ -87,6 +105,17 @@
from PyQt5.Qt import QT_VERSION_STR as QT_VERSION # analysis:ignore
PYSIDE_VERSION = None
except ImportError:
+ API = os.environ['QT_API'] = 'pyside2'
+
+if API in PYSIDE2_API:
+ try:
+ from PySide2 import __version__ as PYSIDE_VERSION # analysis:ignore
+ from PySide2.QtCore import __version__ as QT_VERSION # analysis:ignore
+
+ PYQT_VERSION = None
+ PYQT5 = False
+ PYSIDE2 = True
+ except ImportError:
API = os.environ['QT_API'] = 'pyqt'
if API in PYQT4_API:
@@ -119,13 +148,14 @@
from PySide import __version__ as PYSIDE_VERSION # analysis:ignore
from PySide.QtCore import __version__ as QT_VERSION # analysis:ignore
PYQT_VERSION = None
- PYQT5 = False
+ PYQT5 = PYSIDE2 = False
PYSIDE = True
except ImportError:
raise PythonQtError('No Qt bindings could be found')
API_NAME = {'pyqt5': 'PyQt5', 'pyqt': 'PyQt4', 'pyqt4': 'PyQt4',
- 'pyside': 'PySide'}[API]
+ 'pyside': 'PySide', 'pyside2':'PySide2'}[API]
+
if PYQT4:
import sip
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/_patch/qheaderview.py new/QtPy-1.3.1/qtpy/_patch/qheaderview.py
--- old/QtPy-1.2.1/qtpy/_patch/qheaderview.py 2017-01-02 22:36:20.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/_patch/qheaderview.py 2017-08-21 18:38:49.000000000 +0200
@@ -4,6 +4,7 @@
#
# Licensed under the terms of the MIT License
# (see LICENSE.txt for details)
+import warnings
def introduce_renamed_methods_qheaderview(QHeaderView):
@@ -15,8 +16,9 @@
return _isClickable(self)
QHeaderView.sectionsClickable = sectionsClickable
def isClickable(self):
- raise Exception('isClickable is only available in Qt4. Use '
- 'sectionsClickable instead.')
+ warnings.warn('isClickable is only available in Qt4. Use '
+ 'sectionsClickable instead.', stacklevel=2)
+ return _isClickable(self)
QHeaderView.isClickable = isClickable
@@ -28,8 +30,9 @@
return _isMovable(self)
QHeaderView.sectionsMovable = sectionsMovable
def isMovable(self):
- raise Exception('isMovable is only available in Qt4. Use '
- 'sectionsMovable instead.')
+ warnings.warn('isMovable is only available in Qt4. Use '
+ 'sectionsMovable instead.', stacklevel=2)
+ return _isMovable(self)
QHeaderView.isMovable = isMovable
@@ -41,8 +44,9 @@
return _resizeMode(self, logicalIndex)
QHeaderView.sectionResizeMode = sectionResizeMode
def resizeMode(self, logicalIndex):
- raise Exception('resizeMode is only available in Qt4. Use '
- 'sectionResizeMode instead.')
+ warnings.warn('resizeMode is only available in Qt4. Use '
+ 'sectionResizeMode instead.', stacklevel=2)
+ return _resizeMode(self, logicalIndex)
QHeaderView.resizeMode = resizeMode
_setClickable = QHeaderView.setClickable
@@ -53,8 +57,9 @@
return _setClickable(self, clickable)
QHeaderView.setSectionsClickable = setSectionsClickable
def setClickable(self, clickable):
- raise Exception('setClickable is only available in Qt4. Use '
- 'setSectionsClickable instead.')
+ warnings.warn('setClickable is only available in Qt4. Use '
+ 'setSectionsClickable instead.', stacklevel=2)
+ return _setClickable(self, clickable)
QHeaderView.setClickable = setClickable
@@ -66,8 +71,9 @@
return _setMovable(self, movable)
QHeaderView.setSectionsMovable = setSectionsMovable
def setMovable(self, movable):
- raise Exception('setMovable is only available in Qt4. Use '
- 'setSectionsMovable instead.')
+ warnings.warn('setMovable is only available in Qt4. Use '
+ 'setSectionsMovable instead.', stacklevel=2)
+ return _setMovable(self, movable)
QHeaderView.setMovable = setMovable
@@ -80,8 +86,9 @@
_setResizeMode(self, *args)
QHeaderView.setSectionResizeMode = setSectionResizeMode
def setResizeMode(self, *args):
- raise Exception('setResizeMode is only available in Qt4. Use '
- 'setSectionResizeMode instead.')
+ warnings.warn('setResizeMode is only available in Qt4. Use '
+ 'setSectionResizeMode instead.', stacklevel=2)
+ _setResizeMode(self, *args)
QHeaderView.setResizeMode = setResizeMode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/_version.py new/QtPy-1.3.1/qtpy/_version.py
--- old/QtPy-1.2.1/qtpy/_version.py 2017-01-22 03:09:46.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/_version.py 2017-08-21 18:46:27.000000000 +0200
@@ -1,2 +1,2 @@
-version_info = (1, 2, 1)
+version_info = (1, 3, 1)
__version__ = '.'.join(map(str, version_info))
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/conftest.cpython-35.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/conftest.cpython-35.pyc differ
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/test_main.cpython-35-PYTEST.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/test_main.cpython-35-PYTEST.pyc differ
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/test_patch_qcombobox.cpython-35-PYTEST.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/test_patch_qcombobox.cpython-35-PYTEST.pyc differ
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/test_qtmultimedia.cpython-35-PYTEST.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/test_qtmultimedia.cpython-35-PYTEST.pyc differ
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/test_uic.cpython-35-PYTEST.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/test_uic.cpython-35-PYTEST.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/conftest.py new/QtPy-1.3.1/qtpy/tests/conftest.py
--- old/QtPy-1.2.1/qtpy/tests/conftest.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/conftest.py 2017-05-11 17:36:04.000000000 +0200
@@ -55,5 +55,17 @@
versions += 'unknown version'
versions += os.linesep
+ versions += 'PySide2: '
+
+ try:
+ import PySide2
+ from PySide2 import QtCore
+ versions += "PySide: {0} - Qt: {1}".format(PySide2.__version__, QtCore.__version__)
+ except ImportError:
+ versions += 'not installed'
+ except AttributeError:
+ versions += 'unknown version'
+
+ versions += os.linesep
return versions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_main.py new/QtPy-1.3.1/qtpy/tests/test_main.py
--- old/QtPy-1.2.1/qtpy/tests/test_main.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_main.py 2017-05-11 17:36:04.000000000 +0200
@@ -13,6 +13,15 @@
assert QtWidgets.QWidget is PySide.QtGui.QWidget
assert QtWebEngineWidgets.QWebEnginePage is PySide.QtWebKit.QWebPage
+def assert_pyside2():
+ """
+ Make sure that we are using PySide
+ """
+ import PySide2
+ assert QtCore.QEvent is PySide2.QtCore.QEvent
+ assert QtGui.QPainter is PySide2.QtGui.QPainter
+ assert QtWidgets.QWidget is PySide2.QtWidgets.QWidget
+ assert QtWebEngineWidgets.QWebEnginePage is PySide2.QtWebEngineWidgets.QWebEnginePage
def assert_pyqt4():
"""
@@ -52,6 +61,8 @@
assert_pyqt4()
elif QT_API == 'pyqt5':
assert_pyqt5()
+ elif QT_API == 'pyside2':
+ assert_pyside2()
else:
# If the tests are run locally, USE_QT_API and QT_API may not be
# defined, but we still want to make sure qtpy is behaving sensibly.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_patch_qcombobox.py new/QtPy-1.3.1/qtpy/tests/test_patch_qcombobox.py
--- old/QtPy-1.2.1/qtpy/tests/test_patch_qcombobox.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_patch_qcombobox.py 2017-05-11 17:36:04.000000000 +0200
@@ -1,6 +1,12 @@
from __future__ import absolute_import
-from qtpy import QtGui, QtWidgets
+import sys
+
+import pytest
+from qtpy import PYSIDE2, QtGui, QtWidgets
+
+
+PY3 = sys.version[0] == "3"
def get_qapp(icon_path=None):
@@ -19,6 +25,7 @@
raise ValueError("Failing")
+(a)pytest.mark.skipif(PY3 or PYSIDE2, reason="It segfaults in Python 3 and PYSIDE2")
def test_patched_qcombobox():
"""
In PySide, using Python objects as userData in QComboBox causes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_patch_qheaderview.py new/QtPy-1.3.1/qtpy/tests/test_patch_qheaderview.py
--- old/QtPy-1.2.1/qtpy/tests/test_patch_qheaderview.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_patch_qheaderview.py 2017-08-21 18:38:49.000000000 +0200
@@ -1,12 +1,17 @@
from __future__ import absolute_import
-from qtpy import PYSIDE, PYQT4
+import sys
+
+import pytest
+from qtpy import PYSIDE, PYSIDE2, PYQT4
from qtpy.QtWidgets import QApplication
from qtpy.QtWidgets import QHeaderView
from qtpy.QtCore import Qt
from qtpy.QtCore import QAbstractListModel
-import pytest
+
+PY3 = sys.version[0] == "3"
+
def get_qapp(icon_path=None):
qapp = QApplication.instance()
@@ -14,6 +19,8 @@
qapp = QApplication([''])
return qapp
+
+(a)pytest.mark.skipif(PY3 or PYSIDE2, reason="It fails on Python 3 and PySide2")
def test_patched_qheaderview():
"""
This will test whether QHeaderView has the new methods introduced in Qt5.
@@ -75,17 +82,17 @@
# test that the old methods in Qt4 raise exceptions
if PYQT4 or PYSIDE:
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
headerview.isClickable()
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
headerview.isMovable()
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
headerview.resizeMode(0)
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
headerview.setClickable(True)
- with pytest.raises(Exception):
- headerview.setMovableClickable(True)
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
+ headerview.setMovable(True)
+ with pytest.warns(UserWarning):
headerview.setResizeMode(0, QHeaderView.Interactive)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qdesktopservice_split.py new/QtPy-1.3.1/qtpy/tests/test_qdesktopservice_split.py
--- old/QtPy-1.2.1/qtpy/tests/test_qdesktopservice_split.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qdesktopservice_split.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,28 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import PYSIDE2
+
+"""Test QDesktopServices split in Qt5."""
+
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
+def test_qstandarpath():
+ """Test the qtpy.QStandardPaths namespace"""
+ from qtpy.QtCore import QStandardPaths
+
+ assert QStandardPaths.StandardLocation is not None
+
+ # Attributes from QDesktopServices shouldn't be in QStandardPaths
+ with pytest.raises(AttributeError) as excinfo:
+ QStandardPaths.setUrlHandler
+
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
+def test_qdesktopservice():
+ """Test the qtpy.QDesktopServices namespace"""
+ from qtpy.QtGui import QDesktopServices
+
+ assert QDesktopServices.setUrlHandler is not None
+
+ # Attributes from QStandardPaths shouldn't be in QDesktopServices
+ with pytest.raises(AttributeError) as excinfo:
+ QDesktopServices.StandardLocation
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtcore.py new/QtPy-1.3.1/qtpy/tests/test_qtcore.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtcore.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtcore.py 2017-08-12 17:19:03.000000000 +0200
@@ -0,0 +1,10 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import QtCore
+
+"""Test QtCore."""
+
+def test_qtmsghandler():
+ """Test the qtpy.QtMsgHandler"""
+ assert QtCore.qInstallMessageHandler is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtdesigner.py new/QtPy-1.3.1/qtpy/tests/test_qtdesigner.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtdesigner.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtdesigner.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,28 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import PYSIDE2, PYSIDE
+
+(a)pytest.mark.skipif(PYSIDE2 or PYSIDE, reason="QtDesigner is not avalaible in PySide/PySide2")
+def test_qtdesigner():
+ from qtpy import QtDesigner
+ """Test the qtpy.QtDesigner namespace"""
+ assert QtDesigner.QAbstractExtensionFactory is not None
+ assert QtDesigner.QAbstractExtensionManager is not None
+ assert QtDesigner.QDesignerActionEditorInterface is not None
+ assert QtDesigner.QDesignerContainerExtension is not None
+ assert QtDesigner.QDesignerCustomWidgetCollectionInterface is not None
+ assert QtDesigner.QDesignerCustomWidgetInterface is not None
+ assert QtDesigner.QDesignerFormEditorInterface is not None
+ assert QtDesigner.QDesignerFormWindowCursorInterface is not None
+ assert QtDesigner.QDesignerFormWindowInterface is not None
+ assert QtDesigner.QDesignerFormWindowManagerInterface is not None
+ assert QtDesigner.QDesignerMemberSheetExtension is not None
+ assert QtDesigner.QDesignerObjectInspectorInterface is not None
+ assert QtDesigner.QDesignerPropertyEditorInterface is not None
+ assert QtDesigner.QDesignerPropertySheetExtension is not None
+ assert QtDesigner.QDesignerTaskMenuExtension is not None
+ assert QtDesigner.QDesignerWidgetBoxInterface is not None
+ assert QtDesigner.QExtensionFactory is not None
+ assert QtDesigner.QExtensionManager is not None
+ assert QtDesigner.QFormBuilder is not None
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtmultimedia.py new/QtPy-1.3.1/qtpy/tests/test_qtmultimedia.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtmultimedia.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtmultimedia.py 2017-05-11 17:36:04.000000000 +0200
@@ -1,8 +1,10 @@
from __future__ import absolute_import
-from qtpy import QtMultimedia
+import pytest
+from qtpy import PYSIDE2, QtMultimedia
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
def test_qtmultimedia():
"""Test the qtpy.QtMultimedia namespace"""
assert QtMultimedia.QAbstractVideoBuffer is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtnetwork.py new/QtPy-1.3.1/qtpy/tests/test_qtnetwork.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtnetwork.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtnetwork.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,42 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import PYSIDE, PYSIDE2, QtNetwork
+
+
+(a)pytest.mark.skipif(PYSIDE2 or PYSIDE, reason="It fails on PySide/PySide2")
+def test_qtnetwork():
+ """Test the qtpy.QtNetwork namespace"""
+ assert QtNetwork.QAbstractNetworkCache is not None
+ assert QtNetwork.QNetworkCacheMetaData is not None
+ assert QtNetwork.QHttpMultiPart is not None
+ assert QtNetwork.QHttpPart is not None
+ assert QtNetwork.QNetworkAccessManager is not None
+ assert QtNetwork.QNetworkCookie is not None
+ assert QtNetwork.QNetworkCookieJar is not None
+ assert QtNetwork.QNetworkDiskCache is not None
+ assert QtNetwork.QNetworkReply is not None
+ assert QtNetwork.QNetworkRequest is not None
+ assert QtNetwork.QNetworkConfigurationManager is not None
+ assert QtNetwork.QNetworkConfiguration is not None
+ assert QtNetwork.QNetworkSession is not None
+ assert QtNetwork.QAuthenticator is not None
+ assert QtNetwork.QHostAddress is not None
+ assert QtNetwork.QHostInfo is not None
+ assert QtNetwork.QNetworkAddressEntry is not None
+ assert QtNetwork.QNetworkInterface is not None
+ assert QtNetwork.QNetworkProxy is not None
+ assert QtNetwork.QNetworkProxyFactory is not None
+ assert QtNetwork.QNetworkProxyQuery is not None
+ assert QtNetwork.QAbstractSocket is not None
+ assert QtNetwork.QLocalServer is not None
+ assert QtNetwork.QLocalSocket is not None
+ assert QtNetwork.QTcpServer is not None
+ assert QtNetwork.QTcpSocket is not None
+ assert QtNetwork.QUdpSocket is not None
+ assert QtNetwork.QSslCertificate is not None
+ assert QtNetwork.QSslCipher is not None
+ assert QtNetwork.QSslConfiguration is not None
+ assert QtNetwork.QSslError is not None
+ assert QtNetwork.QSslKey is not None
+ assert QtNetwork.QSslSocket is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtprintsupport.py new/QtPy-1.3.1/qtpy/tests/test_qtprintsupport.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtprintsupport.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtprintsupport.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,18 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import QtPrintSupport
+
+
+def test_qtprintsupport():
+ """Test the qtpy.QtPrintSupport namespace"""
+ assert QtPrintSupport.QAbstractPrintDialog is not None
+ assert QtPrintSupport.QPageSetupDialog is not None
+ assert QtPrintSupport.QPrintDialog is not None
+ assert QtPrintSupport.QPrintPreviewDialog is not None
+ assert QtPrintSupport.QPrintEngine is not None
+ assert QtPrintSupport.QPrinter is not None
+ assert QtPrintSupport.QPrinterInfo is not None
+ assert QtPrintSupport.QPrintPreviewWidget is not None
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtsvg.py new/QtPy-1.3.1/qtpy/tests/test_qtsvg.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtsvg.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtsvg.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,14 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import PYSIDE2
+
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
+def test_qtsvg():
+ """Test the qtpy.QtSvg namespace"""
+ from qtpy import QtSvg
+
+ assert QtSvg.QGraphicsSvgItem is not None
+ assert QtSvg.QSvgGenerator is not None
+ assert QtSvg.QSvgRenderer is not None
+ assert QtSvg.QSvgWidget is not None
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qttest.py new/QtPy-1.3.1/qtpy/tests/test_qttest.py
--- old/QtPy-1.2.1/qtpy/tests/test_qttest.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qttest.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,9 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import QtTest
+
+
+def test_qttest():
+ """Test the qtpy.QtTest namespace"""
+ assert QtTest.QTest is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_uic.py new/QtPy-1.3.1/qtpy/tests/test_uic.py
--- old/QtPy-1.2.1/qtpy/tests/test_uic.py 2017-01-06 03:16:17.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_uic.py 2017-08-12 17:19:03.000000000 +0200
@@ -2,7 +2,8 @@
import sys
import contextlib
-from qtpy import QtWidgets
+import pytest
+from qtpy import PYSIDE2, QtWidgets
from qtpy.QtWidgets import QComboBox
from qtpy import uic
from qtpy.uic import loadUi
@@ -69,6 +70,7 @@
assert isinstance(ui.comboBox, _QComboBoxSubclass)
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
def test_load_full_uic():
"""Test that we load the full uic objects for PyQt5 and PyQt4."""
QT_API = os.environ.get('QT_API', '').lower()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/uic.py new/QtPy-1.3.1/qtpy/uic.py
--- old/QtPy-1.2.1/qtpy/uic.py 2017-01-06 03:16:17.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/uic.py 2017-08-12 17:19:03.000000000 +0200
@@ -1,6 +1,6 @@
import os
-from . import PYSIDE, PYQT4, PYQT5
+from . import PYSIDE, PYSIDE2, PYQT4, PYQT5
from .QtWidgets import QComboBox
@@ -12,7 +12,7 @@
from PyQt4.uic import *
-elif PYSIDE:
+else:
__all__ = ['loadUi']
@@ -78,8 +78,12 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
- from PySide.QtCore import QMetaObject
- from PySide.QtUiTools import QUiLoader
+ if PYSIDE:
+ from PySide.QtCore import QMetaObject
+ from PySide.QtUiTools import QUiLoader
+ elif PYSIDE2:
+ from PySide2.QtCore import QMetaObject
+ from PySide2.QtUiTools import QUiLoader
class UiLoader(QUiLoader):
"""
1
0
Hello community,
here is the log from the commit of package mednafen for openSUSE:Factory checked in at 2017-08-29 11:46:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mednafen (Old)
and /work/SRC/openSUSE:Factory/.mednafen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mednafen"
Tue Aug 29 11:46:21 2017 rev:7 rq:519185 version:0.9.47
Changes:
--------
--- /work/SRC/openSUSE:Factory/mednafen/mednafen.changes 2017-08-12 20:27:27.801835080 +0200
+++ /work/SRC/openSUSE:Factory/.mednafen.new/mednafen.changes 2017-08-29 11:47:36.246523444 +0200
@@ -1,0 +2,6 @@
+Sun Aug 27 21:52:03 UTC 2017 - ilya(a)ilya.pp.ua
+
+- Update to mednafen 0.9.47
+ * ChangeLog https://mednafen.github.io/documentation/ChangeLog.txt
+
+-------------------------------------------------------------------
Old:
----
mednafen-0.9.46.tar.xz
New:
----
mednafen-0.9.47.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mednafen.spec ++++++
--- /var/tmp/diff_new_pack.jv1egN/_old 2017-08-29 11:47:37.278378002 +0200
+++ /var/tmp/diff_new_pack.jv1egN/_new 2017-08-29 11:47:37.306374056 +0200
@@ -18,7 +18,7 @@
Name: mednafen
License: GPL-2.0+
Group: System/Emulators/Other
-Version: 0.9.46
+Version: 0.9.47
Release: 0
Summary: Multiple video game console emulator
Source: https://mednafen.github.io/releases/files/%{name}-%{version}.tar.xz
++++++ mednafen-0.9.46.tar.xz -> mednafen-0.9.47.tar.xz ++++++
++++ 8217 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-rope for openSUSE:Factory checked in at 2017-08-29 11:46:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-rope (Old)
and /work/SRC/openSUSE:Factory/.python-rope.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-rope"
Tue Aug 29 11:46:17 2017 rev:10 rq:519182 version:0.10.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-rope/python-rope.changes 2017-08-16 16:11:36.115169028 +0200
+++ /work/SRC/openSUSE:Factory/.python-rope.new/python-rope.changes 2017-08-29 11:47:33.618893811 +0200
@@ -1,0 +2,7 @@
+Mon Aug 28 16:14:30 UTC 2017 - toddrme2178(a)gmail.com
+
+- update to 0.10.7
+ + Upstream provides no changelog
+- Add tag for CVE-2014-3539-disable-doa.patch
+
+-------------------------------------------------------------------
Old:
----
rope-0.10.5.tar.gz
New:
----
rope-0.10.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-rope.spec ++++++
--- /var/tmp/diff_new_pack.5zAycI/_old 2017-08-29 11:47:35.346650282 +0200
+++ /var/tmp/diff_new_pack.5zAycI/_new 2017-08-29 11:47:35.350649717 +0200
@@ -19,13 +19,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without test
Name: python-rope
-Version: 0.10.5
+Version: 0.10.7
Release: 0
Summary: A python refactoring library
License: GPL-2.0+
Group: Development/Languages/Python
Url: https://github.com/python-rope/rope
Source: https://files.pythonhosted.org/packages/source/r/rope/rope-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM - CVE-2014-3539-disable-doa.patch - https://github.com/python-rope/rope/issues/105
Patch0: CVE-2014-3539-disable-doa.patch
BuildRequires: %{python_module devel}
BuildRequires: fdupes
@@ -48,17 +49,19 @@
%install
export LANG=en_US.UTF-8
%{python_install}
-rm -rf %{buildroot}/%{python_sitelib}/python-rope/ropetest/
-%{python_expand %fdupes %{buildroot}/%{$python_sitelib}}
+%{python_expand rm -rf %{buildroot}/%{%python_sitelib}/python-rope/ropetest/
+%fdupes %{buildroot}/%{$python_sitelib}
+}
%if %{with test}
%check
export LANG=en_US.UTF-8
-%{python_exec setup.py test}
+%python_exec setup.py test
%endif
%files %{python_files}
-%doc COPYING README.rst docs/
+%doc COPYING README.rst
+%doc docs/
%{python_sitelib}/
%changelog
++++++ rope-0.10.5.tar.gz -> rope-0.10.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rope-0.10.5/PKG-INFO new/rope-0.10.7/PKG-INFO
--- old/rope-0.10.5/PKG-INFO 2017-02-23 18:57:18.000000000 +0100
+++ new/rope-0.10.7/PKG-INFO 2017-08-23 06:44:12.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: rope
-Version: 0.10.5
+Version: 0.10.7
Summary: a python refactoring library...
Home-page: https://github.com/python-rope/rope
Author: Ali Gholami Rudi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rope-0.10.5/rope/__init__.py new/rope-0.10.7/rope/__init__.py
--- old/rope-0.10.5/rope/__init__.py 2017-02-23 18:56:42.000000000 +0100
+++ new/rope-0.10.7/rope/__init__.py 2017-08-23 06:41:28.000000000 +0200
@@ -1,7 +1,7 @@
"""rope, a python refactoring library"""
INFO = __doc__
-VERSION = '0.10.5'
+VERSION = '0.10.7'
COPYRIGHT = """\
Copyright (C) 2015-2016 Nicholas Smith
Copyright (C) 2014-2015 Matej Cepl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rope-0.10.5/rope.egg-info/PKG-INFO new/rope-0.10.7/rope.egg-info/PKG-INFO
--- old/rope-0.10.5/rope.egg-info/PKG-INFO 2017-02-23 18:57:18.000000000 +0100
+++ new/rope-0.10.7/rope.egg-info/PKG-INFO 2017-08-23 06:44:12.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: rope
-Version: 0.10.5
+Version: 0.10.7
Summary: a python refactoring library...
Home-page: https://github.com/python-rope/rope
Author: Ali Gholami Rudi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rope-0.10.5/setup.py new/rope-0.10.7/setup.py
--- old/rope-0.10.5/setup.py 2017-02-23 18:56:42.000000000 +0100
+++ new/rope-0.10.7/setup.py 2017-08-23 06:39:32.000000000 +0200
@@ -57,9 +57,9 @@
def get_long_description():
- lines = open('README.rst').read().splitlines(False)
- end = lines.index('Getting Started')
- return '\n' + '\n'.join(lines[:end]) + '\n'
+ lines = open('README.rst', 'rb').read().splitlines(False)
+ end = lines.index(b'Getting Started')
+ return '\n' + str(b'\n'.join(lines[:end])) + '\n'
setup(name='rope',
version=rope.VERSION,
1
0
Hello community,
here is the log from the commit of package gambas3 for openSUSE:Factory checked in at 2017-08-29 11:46:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gambas3 (Old)
and /work/SRC/openSUSE:Factory/.gambas3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gambas3"
Tue Aug 29 11:46:10 2017 rev:3 rq:519176 version:3.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gambas3/gambas3.changes 2017-06-07 09:55:15.516080482 +0200
+++ /work/SRC/openSUSE:Factory/.gambas3.new/gambas3.changes 2017-08-29 11:47:28.251650333 +0200
@@ -1,0 +2,17 @@
+Mon Aug 28 12:33:11 UTC 2017 - zaitor(a)opensuse.org
+
+- Pull in tarball from upstream again to please Factory source
+ checker bots, as a new tarball with same version was uploaded
+
+-------------------------------------------------------------------
+Wed Jul 19 03:54:23 UTC 2017 - avvissu(a)yandex.by
+
+- Update to 3.10.0:
+ * see: http://gambaswiki.org/wiki/doc/release/3.10.0
+- Add component gambas3-gb-term
+- Drop gambas3-3.9.2-gcc7.patch
+- Rename and rebase gambas3-3.9.2-llvm.patch to
+ gambas3-3.10.0-llvm.patch
+- Spec file cleanup
+
+-------------------------------------------------------------------
Old:
----
gambas3-3.9.2-gcc7.patch
gambas3-3.9.2-llvm.patch
gambas3-3.9.2.tar.bz2
New:
----
gambas3-3.10.0-llvm.patch
gambas3-3.10.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gambas3.spec ++++++
--- /var/tmp/diff_new_pack.FujlVt/_old 2017-08-29 11:47:30.299361705 +0200
+++ /var/tmp/diff_new_pack.FujlVt/_new 2017-08-29 11:47:30.303361141 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gambas3
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2012-2015 Lars Vogdt <lars(a)linux-schulserver.de>
#
# All modifications and additions to the file contributed by third parties
@@ -24,7 +24,7 @@
%endif
%endif
Name: gambas3
-Version: 3.9.2
+Version: 3.10.0
Release: 0
Summary: BASIC interpreter under Linux
License: GPL-2.0+
@@ -37,9 +37,7 @@
# PATCH-FIX-OPENSUSE -- add german translation
Patch0: gambas3-mime_translation.patch
# PATCH-FIX-OPENSUSE llvm.patch avvissu(a)yandex.ru -- Change the location for an header files
-Patch1: gambas3-3.9.2-llvm.patch
-# PATCH-FIX-UPSTREAM gcc7.patch -- https://sourceforge.net/p/gambas/mailman/message/35637223/
-Patch2: gambas3-3.9.2-gcc7.patch
+Patch1: gambas3-3.10.0-llvm.patch
BuildRequires: SDL_image
BuildRequires: aalib-devel
BuildRequires: atk-devel
@@ -62,12 +60,19 @@
BuildRequires: unixODBC-devel
BuildRequires: update-desktop-files
BuildRequires: xdg-utils
-BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(ORBit-2.0)
+BuildRequires: pkgconfig(QtCore) >= 4.5
+BuildRequires: pkgconfig(QtGui)
+BuildRequires: pkgconfig(QtNetwork)
+BuildRequires: pkgconfig(QtOpenGL)
+BuildRequires: pkgconfig(QtSvg)
+BuildRequires: pkgconfig(QtWebKit)
+BuildRequires: pkgconfig(QtXml)
BuildRequires: pkgconfig(SDL_gfx)
BuildRequires: pkgconfig(SDL_image)
BuildRequires: pkgconfig(SDL_mixer)
BuildRequires: pkgconfig(SDL_ttf)
+BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(dri)
BuildRequires: pkgconfig(fontconfig)
@@ -100,14 +105,6 @@
BuildRequires: pkgconfig(webkit-1.0)
BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(zlib)
-BuildRequires: pkgconfig(QtCore) >= 4.5
-BuildRequires: pkgconfig(QtGui)
-BuildRequires: pkgconfig(QtNetwork)
-BuildRequires: pkgconfig(QtOpenGL)
-BuildRequires: pkgconfig(QtSvg)
-BuildRequires: pkgconfig(QtXml)
-BuildRequires: pkgconfig(QtWebKit)
-BuildRequires: pkgconfig(QtXml)
%if !%{with qt4}
BuildRequires: pkgconfig(Qt5Core) >= 5.3.0
BuildRequires: pkgconfig(Qt5Gui)
@@ -214,11 +211,14 @@
Recommends: %{name}-gb-util-web = %{version}
Recommends: %{name}-gb-v4l = %{version}
Recommends: %{name}-gb-vb = %{version}
-Recommends: %{name}-gb-web = %{version}
+Recommends: %{name}-gb-web-feed = %{version}
+Recommends: %{name}-gb-web-form = %{version}
Recommends: %{name}-gb-xml = %{version}
Recommends: %{name}-gb-xml-rpc = %{version}
Recommends: %{name}-gb-xml-xslt = %{version}
Recommends: %{name}-gb-form-terminal = %{version}
+Recommends: %{name}-gb-term = %{version}
+Recommends: %{name}-gb-term-form = %{version}
Recommends: %{name}-script = %{version}
Recommends: deb
%if %{with jit}
@@ -227,13 +227,13 @@
%if !%{with qt4}
Requires: %{name}-gb-qt5 = %{version}
Requires: %{name}-gb-qt5-ext = %{version}
-Requires: %{name}-gb-qt5-webkit = %{version}
Requires: %{name}-gb-qt5-opengl = %{version}
+Requires: %{name}-gb-qt5-webkit = %{version}
%else
Requires: %{name}-gb-qt4 = %{version}
Requires: %{name}-gb-qt4-ext = %{version}
-Requires: %{name}-gb-qt4-webkit = %{version}
Requires: %{name}-gb-qt4-opengl = %{version}
+Requires: %{name}-gb-qt4-webkit = %{version}
%endif
%description ide
@@ -252,7 +252,6 @@
applications.
It contains:
-
* The interpreter: gbx3.
* The symbolic link on gbx3: gbr3.
* The internal component description: gb.component, gb.info and gb.list.
@@ -480,10 +479,9 @@
%description gb-dbus
By using this component, you will be able to:
-
-* Call any method and properties of any application connected to D-Bus.
-* Catch any signal sent by any application connected to D-Bus.
-* Export your own objects to a D-Bus bus.
+ * Call any method and properties of any application connected to D-Bus.
+ * Catch any signal sent by any application connected to D-Bus.
+ * Export your own objects to a D-Bus bus.
For more information, see http://dbus.freedesktop.org.
@@ -515,6 +513,7 @@
%package gb-form-editor
Summary: Text editor for Gambas
+Group: Development/Tools/IDE
Requires: %{name}-gb-eval-highlight = %{version}
Requires: %{name}-runtime = %{version}
@@ -605,6 +604,7 @@
%package gb-httpd
Summary: The httpd component for Gambas
+Group: Development/Tools/IDE
Requires: %{name}-runtime = %{version}
%description gb-httpd
@@ -630,8 +630,8 @@
%package gb-image-imlib
Summary: Gambas image routines based on the Imlib2 library
Group: Development/Tools/IDE
-Requires: %(rpm -qf $(readlink -qne %{_libdir}/libImlib2.so) --qf '%{NAME} >= %{VERSION}')
Requires: %{name}-gb-image = %{version}
+Requires: %(rpm -qf $(readlink -qne %{_libdir}/libImlib2.so) --qf '%{NAME} >= %{VERSION}')
%description gb-image-imlib
This components adds image processing methods coming from the imlib2 library.
@@ -706,6 +706,7 @@
%package gb-memcached
Summary: The memcached component for Gambas
+Group: Development/Tools/IDE
Requires: %{name}-runtime = %{version}
%description gb-memcached
@@ -823,6 +824,7 @@
%package gb-option
Summary: The second C getopt() interface component for Gambas
+Group: Development/Tools/IDE
Requires: %{name}-runtime = %{version}
%description gb-option
@@ -1072,13 +1074,21 @@
This is a component for making CGI web applications, with an ASP-like
interface.
+%package gb-web-feed
+Summary: The component to generate and parse RSS documents
+Group: Development/Tools/IDE
+Requires: %{name}-gb-web = %{version}
+
+%description gb-web-feed
+This package contains the Gambas3 component to generate and parse RSS
+documents.
+
%package gb-web-form
Summary: The CUI web component for Gambas
Group: Development/Tools/IDE
-Requires: %{name}-gb-web = %{version}
-Requires: %{name}-gb-util-web = %{version}
Requires: %{name}-gb-util = %{version}
-Requires: %{name}-runtime = %{version}
+Requires: %{name}-gb-util-web = %{version}
+Requires: %{name}-gb-web = %{version}
%description gb-web-form
This component allows to make the GUI of a web application with the IDE
@@ -1092,11 +1102,28 @@
%description gb-form-terminal
This package contains the Gambas3 component for terminal in form.
+%package gb-term
+Summary: The component for terminal management with an API
+Group: Development/Tools/IDE
+Requires: %{name}-runtime = %{version}
+
+%description gb-term
+This package contains the Gambas3 component for making the GUI of terminal
+applications.
+
+%package gb-term-form
+Summary: The component for making the GUI of terminal applications
+Group: Development/Tools/IDE
+Requires: %{name}-gb-term = %{version}
+
+%description gb-term-form
+This package contains the Gambas3 component for making the GUI of terminal
+applications.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p3
# don't compile in DATE and TIME
BUILDTIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%H:%M')
@@ -1840,7 +1867,13 @@
%{_datadir}/%{name}/info/gb.web.info
%{_datadir}/%{name}/info/gb.web.list
+%files gb-web-feed
+%defattr(-,root,root)
+%{_datadir}/%{name}/info/gb.web.feed.info
+%{_datadir}/%{name}/info/gb.web.feed.list
+
%files gb-web-form
+%defattr(-,root,root)
%dir %{_datadir}/%{name}/control
%dir %{_datadir}/%{name}/control/gb.web.form
%{_datadir}/%{name}/control/gb.web.form/*.png
@@ -1848,6 +1881,7 @@
%{_datadir}/%{name}/info/gb.web.form.list
%files gb-form-terminal
+%defattr(-,root,root)
%dir %{_datadir}/%{name}/control
%dir %{_datadir}/%{name}/control/gb.form.terminal
%{_libdir}/%{name}/gb.form.terminal.component
@@ -1856,4 +1890,19 @@
%{_datadir}/%{name}/info/gb.form.terminal.info
%{_datadir}/%{name}/info/gb.form.terminal.list
+%files gb-term
+%defattr(-,root,root)
+%{_libdir}/%{name}/gb.term.component
+%{_libdir}/%{name}/gb.term.la
+%{_libdir}/%{name}/gb.term.so*
+%{_datadir}/%{name}/info/gb.term.info
+%{_datadir}/%{name}/info/gb.term.list
+
+%files gb-term-form
+%defattr(-,root,root)
+%{_libdir}/%{name}/gb.term.form.component
+%{_libdir}/%{name}/gb.term.form.gambas
+%{_datadir}/%{name}/info/gb.term.form.info
+%{_datadir}/%{name}/info/gb.term.form.list
+
%changelog
++++++ gambas3-3.9.2-llvm.patch -> gambas3-3.10.0-llvm.patch ++++++
--- /work/SRC/openSUSE:Factory/gambas3/gambas3-3.9.2-llvm.patch 2017-02-28 23:49:23.243284363 +0100
+++ /work/SRC/openSUSE:Factory/.gambas3.new/gambas3-3.10.0-llvm.patch 2017-08-29 11:47:23.332343720 +0200
@@ -1,16 +1,12 @@
-diff -ruN gambas3-3.9.2.orig/gb.jit/configure.ac gambas3-3.9.2/gb.jit/configure.ac
---- gambas3-3.9.2.orig/gb.jit/configure.ac 2016-12-17 15:38:07.000000000 +0300
-+++ gambas3-3.9.2/gb.jit/configure.ac 2017-02-05 12:30:27.430563610 +0300
-@@ -37,9 +37,9 @@
+diff -ruN gambas3-3.10.0.orig/gb.jit/configure.ac gambas3-3.10.0/gb.jit/configure.ac
+--- gambas3-3.10.0.orig/gb.jit/configure.ac 2017-07-17 23:38:23.000000000 +0300
++++ gambas3-3.10.0/gb.jit/configure.ac 2017-07-19 10:05:32.686911825 +0300
+@@ -43,7 +43,7 @@
GB_COMPONENT(
jit, JIT, gb.jit, [src],
- [GB_FIND(llvm/ExecutionEngine/JIT.h llvm/Config/llvm-config.h llvm-c/Core.h, `$LLVM_CONFIG --prefix` /usr/lib/llvm* /usr/local /usr, include)],
-- [GB_FIND(libLLVM-$LLVM_VERSION.$SHLIBEXT, `$LLVM_CONFIG --prefix` /usr/lib/llvm* /usr/local /usr, lib)],
-- [$C_LIB `$LLVM_CONFIG --ldflags` -lLLVM-$LLVM_VERSION],
+ [GB_FIND(llvm/ExecutionEngine/JIT.h llvm/Config/llvm-config.h llvm-c/Core.h, $LLVM_INCLUDE, .)],
-+ [],
-+ [$C_LIB `$LLVM_CONFIG --ldflags` $LLVM_LIBS],
+ [],
+ [$C_LIB `$LLVM_CONFIG --ldflags` $LLVM_LIBS],
[-I../../main/gbx -I../../main/share -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS])
-
- AC_OUTPUT(Makefile src/Makefile)
++++++ gambas3-3.9.2.tar.bz2 -> gambas3-3.10.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/gambas3/gambas3-3.9.2.tar.bz2 /work/SRC/openSUSE:Factory/.gambas3.new/gambas3-3.10.0.tar.bz2 differ: char 11, line 1
1
0
Hello community,
here is the log from the commit of package python-parallax for openSUSE:Factory checked in at 2017-08-29 11:45:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-parallax (Old)
and /work/SRC/openSUSE:Factory/.python-parallax.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-parallax"
Tue Aug 29 11:45:56 2017 rev:8 rq:519175 version:1.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-parallax/python-parallax.changes 2016-12-10 18:29:27.411464160 +0100
+++ /work/SRC/openSUSE:Factory/.python-parallax.new/python-parallax.changes 2017-08-29 11:47:19.484886029 +0200
@@ -1,0 +2,6 @@
+Mon Aug 28 12:57:29 UTC 2017 - kgronlund(a)suse.com
+
+- Release 1.0.2
+- Switch to new singlespec packaging
+
+-------------------------------------------------------------------
Old:
----
parallax-1.0.1.tar.gz
New:
----
parallax-1.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-parallax.spec ++++++
--- /var/tmp/diff_new_pack.SMm5oJ/_old 2017-08-29 11:47:20.824697179 +0200
+++ /var/tmp/diff_new_pack.SMm5oJ/_new 2017-08-29 11:47:20.832696052 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-parallax
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,16 +16,19 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+
Name: python-parallax
-Version: 1.0.1
+Version: 1.0.2
Release: 0
Summary: Execute commands and copy files over SSH to multiple machines at once
License: BSD-3-Clause
Group: Development/Languages/Python
Url: https://github.com/krig/parallax/
-Source: https://pypi.python.org/packages/source/p/parallax/parallax-%{version}.tar.…
-BuildRequires: python-devel
-BuildRequires: python-setuptools
+Source: https://files.pythonhosted.org/packages/34/a7/039f774fcc9d1aff6bfe219690287…
+BuildRequires: %{python_module setuptools}
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: openssh
BuildArch: noarch
@@ -42,36 +45,31 @@
nodes at once using SSH. It also provides commands for sending and receiving files to
multiple nodes using SCP.
+%python_subpackages
+
%prep
%setup -q -n parallax-%{version}
%build
-python setup.py build
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_clone -a %{buildroot}%{_bindir}/parallax-askpass
-# create a dummy target for /etc/alternatives/parallax-askpass
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-mv %{buildroot}%{_bindir}/parallax-askpass %{buildroot}%{_bindir}/parallax-askpass-%{py_ver}
-ln -s -f %{_sysconfdir}/alternatives/parallax-askpass %{buildroot}%{_bindir}/parallax-askpass
+%fdupes %{buildroot}%{_prefix}
%post
-%_sbindir/update-alternatives \
- --install %{_bindir}/parallax-askpass parallax-askpass %{_bindir}/parallax-askpass-%{py_ver} 20
+%python_install_alternative parallax-askpass
-%preun
-if [ "$1" = 0 ] ; then
- %_sbindir/update-alternatives --remove parallax-askpass %{_bindir}/parallax-askpass-%{py_ver}
-fi
+%postun
+%python_uninstall_alternative parallax-askpass
-%files
+%files %{python_files}
%defattr(-,root,root,-)
%doc AUTHORS README.md COPYING
%{python_sitelib}/parallax
%{python_sitelib}/parallax-%{version}*.egg-info
-%{_bindir}/parallax-askpass
-%{_bindir}/parallax-askpass-%{py_ver}
-%ghost %_sysconfdir/alternatives/parallax-askpass
+%python_alternative %{_bindir}/parallax-askpass
%changelog
++++++ parallax-1.0.1.tar.gz -> parallax-1.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/MANIFEST.in new/parallax-1.0.2/MANIFEST.in
--- old/parallax-1.0.1/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100
+++ new/parallax-1.0.2/MANIFEST.in 2017-08-28 14:50:48.000000000 +0200
@@ -0,0 +1,6 @@
+# Determines which files are included in sdist and bdist.
+# MANIFEST.in docs: http://docs.python.org/distutils/commandref.html
+
+include COPYING
+include AUTHORS
+include README
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/PKG-INFO new/parallax-1.0.2/PKG-INFO
--- old/parallax-1.0.1/PKG-INFO 2015-06-12 17:24:21.000000000 +0200
+++ new/parallax-1.0.2/PKG-INFO 2017-08-28 14:51:12.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: parallax
-Version: 1.0.1
+Version: 1.0.2
Summary: Execute commands and copy files over SSH to multiple machines at once
Home-page: https://github.com/krig/parallax/
Author: Kristoffer Gronlund
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/README new/parallax-1.0.2/README
--- old/parallax-1.0.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/parallax-1.0.2/README 2014-12-25 18:53:06.000000000 +0100
@@ -0,0 +1,76 @@
+# Parallax SSH
+
+Parallax SSH is a fork of [Parallel SSH][pssh] which focuses less on
+command-line tools and more on providing a flexible and programmable
+API that can be used by Python application developers to perform SSH
+operations across multiple machines.
+
+## Installation
+
+Parallax intends to be compatible with Python 2.6 and above (including
+Python 3.1 and greater), but is primarily tested with Python 2.7.
+
+Installation requires setuptools or ez_setup.py. The latter can be
+downloaded [here][ez].
+
+Once those requirements are fulfilled, installation is as simple as:
+
+ # sudo python setup.py install
+
+Packaged versions of Parallax SSH for various distributions can be
+downloaded from the openSUSE [OBS][obs].
+
+To install via PyPI, use `pip`:
+
+ # pip install parallax
+
+Share and enjoy!
+
+## Usage
+
+* `parallax.call(hosts, cmdline, opts)`
+
+ Executes the given command on a set of hosts, collecting the output.
+
+ Returns a dict mapping the hostname of
+ each host either to a tuple containing a return code,
+ stdout and stderr, or an `parallax.Error` instance
+ describing the error.
+
+* `parallax.copy(hosts, src, dst, opts)`
+
+ Copies files from `src` on the local machine to `dst` on the
+ remote hosts.
+
+ Returns a dict mapping the hostname of
+ each host either to a path, or an `parallax.Error` instance
+ describing the error.
+
+* `parallax.slurp(hosts, src, dst, opts)`
+
+ Copies files from `src` on the remote hosts to a local folder for
+ each of the remote hosts.
+
+ Returns a dict mapping the hostname of
+ each host either to a path, or an `parallax.Error` instance
+ describing the error.
+
+## How it works
+
+By default, Parallax SSH uses at most 32 SSH process in parallel to
+SSH to the nodes. By default, it uses a timeout of one minute to SSH
+to a node and obtain a result.
+
+## Environment variables
+
+* `PARALLAX_HOSTS`
+* `PARALLAX_USER`
+* `PARALLAX_PAR`
+* `PARALLAX_OUTDIR`
+* `PARALLAX_VERBOSE`
+* `PARALLAX_OPTIONS`
+
+
+ [pssh]: https://code.google.com/p/parallel-ssh/ "parallel-ssh"
+ [ez]: http://peak.telecommunity.com/dist/ez_setup.py "ez_setup.py"
+ [obs]: https://build.opensuse.org/package/show/devel:languages:python/python-paral… "OBS:python-parallax"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/parallax/__init__.py new/parallax-1.0.2/parallax/__init__.py
--- old/parallax-1.0.1/parallax/__init__.py 2015-06-12 17:05:57.000000000 +0200
+++ new/parallax-1.0.2/parallax/__init__.py 2016-12-15 14:05:44.000000000 +0100
@@ -172,8 +172,8 @@
manager.add_task(t)
try:
return manager.run()
- except FatalError:
- sys.exit(1)
+ except FatalError as err:
+ raise IOError(str(err))
class _CopyOutputBuilder(object):
@@ -246,8 +246,8 @@
manager.add_task(t)
try:
return manager.run()
- except FatalError:
- sys.exit(1)
+ except FatalError as err:
+ raise IOError(str(err))
class _SlurpOutputBuilder(object):
@@ -343,5 +343,5 @@
manager.add_task(t)
try:
return manager.run()
- except FatalError:
- sys.exit(1)
+ except FatalError as err:
+ raise IOError(str(err))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/parallax/manager.py new/parallax-1.0.2/parallax/manager.py
--- old/parallax-1.0.1/parallax/manager.py 2015-02-20 17:00:12.000000000 +0100
+++ new/parallax-1.0.2/parallax/manager.py 2016-12-15 14:03:04.000000000 +0100
@@ -8,6 +8,7 @@
import sys
import threading
import copy
+import fcntl
try:
import queue
@@ -247,6 +248,7 @@
# Setup the wakeup file descriptor to avoid hanging on lost signals.
wakeup_readfd, wakeup_writefd = os.pipe()
+ fcntl.fcntl(wakeup_writefd, fcntl.F_SETFL, os.O_NONBLOCK)
self.register_read(wakeup_readfd, self.wakeup_handler)
# TODO: remove test when we stop supporting Python <2.5
if hasattr(signal, 'set_wakeup_fd'):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/parallax/version.py new/parallax-1.0.2/parallax/version.py
--- old/parallax-1.0.1/parallax/version.py 2015-06-12 17:19:57.000000000 +0200
+++ new/parallax-1.0.2/parallax/version.py 2017-08-28 14:33:51.000000000 +0200
@@ -1 +1 @@
-VERSION = '1.0.1'
+VERSION = '1.0.2'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/parallax.egg-info/PKG-INFO new/parallax-1.0.2/parallax.egg-info/PKG-INFO
--- old/parallax-1.0.1/parallax.egg-info/PKG-INFO 1970-01-01 01:00:00.000000000 +0100
+++ new/parallax-1.0.2/parallax.egg-info/PKG-INFO 2017-08-28 14:51:12.000000000 +0200
@@ -0,0 +1,29 @@
+Metadata-Version: 1.1
+Name: parallax
+Version: 1.0.2
+Summary: Execute commands and copy files over SSH to multiple machines at once
+Home-page: https://github.com/krig/parallax/
+Author: Kristoffer Gronlund
+Author-email: krig(a)koru.se
+License: BSD
+Description: Parallax SSH provides an interface to executing commands on multiple
+ nodes at once using SSH. It also provides commands for sending and receiving files to
+ multiple nodes using SCP.
+Platform: linux
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.1
+Classifier: Programming Language :: Python :: 3.2
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: System :: Clustering
+Classifier: Topic :: System :: Networking
+Classifier: Topic :: System :: Systems Administration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/parallax.egg-info/SOURCES.txt new/parallax-1.0.2/parallax.egg-info/SOURCES.txt
--- old/parallax-1.0.1/parallax.egg-info/SOURCES.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/parallax-1.0.2/parallax.egg-info/SOURCES.txt 2017-08-28 14:51:12.000000000 +0200
@@ -0,0 +1,21 @@
+AUTHORS
+COPYING
+MANIFEST.in
+README
+README.md
+setup.py
+bin/parallax-askpass
+parallax/__init__.py
+parallax/askpass_client.py
+parallax/askpass_server.py
+parallax/callbacks.py
+parallax/color.py
+parallax/manager.py
+parallax/psshutil.py
+parallax/task.py
+parallax/version.py
+parallax.egg-info/PKG-INFO
+parallax.egg-info/SOURCES.txt
+parallax.egg-info/dependency_links.txt
+parallax.egg-info/top_level.txt
+test/test_api.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/parallax.egg-info/dependency_links.txt new/parallax-1.0.2/parallax.egg-info/dependency_links.txt
--- old/parallax-1.0.1/parallax.egg-info/dependency_links.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/parallax-1.0.2/parallax.egg-info/dependency_links.txt 2017-08-28 14:51:12.000000000 +0200
@@ -0,0 +1 @@
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/parallax.egg-info/top_level.txt new/parallax-1.0.2/parallax.egg-info/top_level.txt
--- old/parallax-1.0.1/parallax.egg-info/top_level.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/parallax-1.0.2/parallax.egg-info/top_level.txt 2017-08-28 14:51:12.000000000 +0200
@@ -0,0 +1 @@
+parallax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/setup.cfg new/parallax-1.0.2/setup.cfg
--- old/parallax-1.0.1/setup.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/parallax-1.0.2/setup.cfg 2017-08-28 14:51:12.000000000 +0200
@@ -0,0 +1,4 @@
+[egg_info]
+tag_build =
+tag_date = 0
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/setup.py new/parallax-1.0.2/setup.py
--- old/parallax-1.0.1/setup.py 2015-06-12 17:19:26.000000000 +0200
+++ new/parallax-1.0.2/setup.py 2017-08-28 14:47:56.000000000 +0200
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
from parallax import version
long_description = """Parallax SSH provides an interface to executing commands on multiple
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.1/test/test_api.py new/parallax-1.0.2/test/test_api.py
--- old/parallax-1.0.1/test/test_api.py 2015-02-20 17:00:12.000000000 +0100
+++ new/parallax-1.0.2/test/test_api.py 2016-12-15 14:03:04.000000000 +0100
@@ -11,7 +11,7 @@
basedir, bin = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
sys.path.insert(0, "%s" % basedir)
-print basedir
+print(basedir)
import parallax as para
@@ -28,7 +28,7 @@
def testSimpleCall(self):
opts = para.Options()
opts.default_user = g_user
- for host, result in para.call(g_hosts, "ls -l /", opts).iteritems():
+ for host, result in para.call(g_hosts, "ls -l /", opts).items():
if isinstance(result, para.Error):
raise result
rc, out, err = result
@@ -38,17 +38,17 @@
def testUptime(self):
opts = para.Options()
opts.default_user = g_user
- for host, result in para.call(g_hosts, "uptime", opts).iteritems():
+ for host, result in para.call(g_hosts, "uptime", opts).items():
if isinstance(result, para.Error):
raise result
rc, out, err = result
self.assertEqual(rc, 0)
- self.assert_(out.find("load average") != -1)
+ self.assert_(out.decode("utf8").find("load average") != -1)
def testFailingCall(self):
opts = para.Options()
opts.default_user = g_user
- for host, result in para.call(g_hosts, "touch /foofoo/barbar/jfikjfdj", opts).iteritems():
+ for host, result in para.call(g_hosts, "touch /foofoo/barbar/jfikjfdj", opts).items():
self.assert_(isinstance(result, para.Error))
self.assert_(str(result).find('with error code') != -1)
@@ -65,14 +65,14 @@
opts.default_user = g_user
opts.localdir = self.tmpDir
by_host = para.copy(g_hosts, "/etc/hosts", "/tmp/para.test", opts)
- for host, result in by_host.iteritems():
+ for host, result in by_host.items():
if isinstance(result, para.Error):
raise result
rc, _, _ = result
self.assertEqual(rc, 0)
by_host = para.slurp(g_hosts, "/tmp/para.test", "para.test", opts)
- for host, result in by_host.iteritems():
+ for host, result in by_host.items():
if isinstance(result, para.Error):
raise result
rc, _, _, path = result
@@ -83,4 +83,6 @@
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(CallTest, "test"))
suite.addTest(unittest.makeSuite(CopySlurpTest, "test"))
- unittest.TextTestRunner().run(suite)
+ result = unittest.TextTestRunner().run(suite)
+ if not result.wasSuccessful():
+ sys.exit(1)
1
0
Hello community,
here is the log from the commit of package java-9-openjdk for openSUSE:Factory checked in at 2017-08-29 11:45:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-9-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-9-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-9-openjdk"
Tue Aug 29 11:45:50 2017 rev:9 rq:519148 version:9.0.0.0~181
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-9-openjdk/java-9-openjdk.changes 2017-08-28 15:16:04.429927496 +0200
+++ /work/SRC/openSUSE:Factory/.java-9-openjdk.new/java-9-openjdk.changes 2017-08-29 11:47:10.150201781 +0200
@@ -1,0 +2,11 @@
+Mon Aug 28 13:56:41 UTC 2017 - fstrba(a)suse.com
+
+- Redo packaging to correspond to the upstream layout and avoid
+ distributing the JRE twice
+- Re-enable bootcycle build for all architectures and distributions
+- Add more recent systemtap-tapset tarball
+- Added patch:
+ * bootcycle_jobs.patch
+ - fix bootcycle build
+
+-------------------------------------------------------------------
Old:
----
systemtap-tapset.tar.gz
New:
----
bootcycle_jobs.patch
systemtap-tapset.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-9-openjdk.spec ++++++
++++ 628 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/java-9-openjdk/java-9-openjdk.spec
++++ and /work/SRC/openSUSE:Factory/.java-9-openjdk.new/java-9-openjdk.spec
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.09w2sm/_old 2017-08-29 11:47:17.309192699 +0200
+++ /var/tmp/diff_new_pack.09w2sm/_new 2017-08-29 11:47:17.325190444 +0200
@@ -1,7 +1,7 @@
<constraints>
<hardware>
<physicalmemory>
- <size unit="M">2048</size>
+ <size unit="M">4096</size>
</physicalmemory>
<disk>
<size unit="G">20</size>
++++++ bootcycle_jobs.patch ++++++
--- jdk9/make/Init.gmk Thu Mar 16 16:34:33 2017 +0000
+++ jdk9/make/Init.gmk Tue Apr 04 13:49:37 2017 +0100
@@ -303,7 +303,8 @@
$(call PrepareSmartJavac)
( cd $(TOPDIR) && \
$(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
- -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
+ $(if $(DISABLE_JOBS),, -j $(JOBS)) \
+ -f make/Main.gmk $(USER_MAKE_VARS) \
$(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
( exitcode=$$? && \
$(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
--- jdk9/make/Main.gmk Thu Mar 16 16:34:33 2017 +0000
+++ jdk9/make/Main.gmk Tue Apr 04 13:49:37 2017 +0100
@@ -320,7 +320,7 @@
ifneq ($(COMPILE_TYPE), cross)
$(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
+$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
- JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
+ DISABLE_JOBS=true SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
else
$(call LogWarn, Boot cycle build disabled when cross compiling)
endif
1
0
Hello community,
here is the log from the commit of package cryptctl for openSUSE:Factory checked in at 2017-08-29 11:45:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cryptctl (Old)
and /work/SRC/openSUSE:Factory/.cryptctl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cryptctl"
Tue Aug 29 11:45:47 2017 rev:6 rq:519142 version:2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/cryptctl/cryptctl.changes 2017-06-20 09:39:19.021190295 +0200
+++ /work/SRC/openSUSE:Factory/.cryptctl.new/cryptctl.changes 2017-08-29 11:47:00.259595900 +0200
@@ -1,0 +2,7 @@
+Mon Aug 28 13:37:13 UTC 2017 - hguo(a)suse.com
+
+- Upgrade to upstream release 2.3 that brings a new feature to allow
+ system administrators to issue mount/umount commands to client
+ computers via key server. (fate#322292)
+
+-------------------------------------------------------------------
Old:
----
cryptctl-2.2.tgz
New:
----
cryptctl-2.3.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cryptctl.spec ++++++
--- /var/tmp/diff_new_pack.uP9lpM/_old 2017-08-29 11:47:03.559130817 +0200
+++ /var/tmp/diff_new_pack.uP9lpM/_new 2017-08-29 11:47:03.591126307 +0200
@@ -17,7 +17,7 @@
Name: cryptctl
-Version: 2.2
+Version: 2.3
Release: 0
Summary: A utility for setting up LUKS-based disk encryption
License: GPL-3.0
++++++ cryptctl-2.2.tgz -> cryptctl-2.3.tgz ++++++
++++ 2768 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package certbot for openSUSE:Factory checked in at 2017-08-29 11:45:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/certbot (Old)
and /work/SRC/openSUSE:Factory/.certbot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "certbot"
Tue Aug 29 11:45:44 2017 rev:12 rq:519138 version:0.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/certbot/certbot.changes 2017-08-12 20:28:44.063146506 +0200
+++ /work/SRC/openSUSE:Factory/.certbot.new/certbot.changes 2017-08-29 11:46:56.596112284 +0200
@@ -1,0 +2,7 @@
+Fri Aug 25 06:07:01 UTC 2017 - ecsos(a)opensuse.org
+
+- On request from upstream switch server parameter in cli.ini from
+ staging to production server.
+- Change description in README.SUSE.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ README.SUSE ++++++
--- /var/tmp/diff_new_pack.mkZDaS/_old 2017-08-29 11:46:57.288014758 +0200
+++ /var/tmp/diff_new_pack.mkZDaS/_new 2017-08-29 11:46:57.292014194 +0200
@@ -1,13 +1,31 @@
-Things you must change to use the production server
-===================================================
+Explanatory notes
+=================
+When you don't know a lot about certbot, you sould use first the staging server.
+With staging server you can make tests without lock out you from letsencrypt servers.
+You can sitch to it in /etc/certbot/cli.ini.
+After switch to staging server, you can generate a test certificate.
+
+And after tests and everything is in order you must change back to production server
+After switch back to production server, you must also generate your production certificate.
+
+
+Things you must change to use the staging or producation server
+===============================================================
First you must change settings (domains, email, challenges) in
/etc/certbot/cli.ini.
-In /etc/certbot/cli.ini the staging (testing) server is enabled.
+
+Things you must change to use the staging server
+================================================
+You must change the server in /etc/certbot/cli.ini to staging server.
You can make tests without lock out you from letsencrypt servers.
-After that when all go right, you _must_ change the server in
-/etc/certbot/cli.ini to production server.
+
+Things you must change to use the production server
+===================================================
+At beginning in /etc/certbot/cli.ini the production server is enabled.
+After switch to staging after test, you must switch back to production server
+in /etc/certbot/cli.ini.
You _must_ change /etc/cron.d/certbot with your settings,
so the certificate is renewed.
++++++ certbot-cli.ini.patch ++++++
--- /var/tmp/diff_new_pack.mkZDaS/_old 2017-08-29 11:46:57.308011939 +0200
+++ /var/tmp/diff_new_pack.mkZDaS/_new 2017-08-29 11:46:57.312011375 +0200
@@ -2,14 +2,16 @@
===================================================================
--- certbot-0.17.0.orig/examples/cli.ini
+++ certbot-0.17.0/examples/cli.ini
-@@ -10,14 +10,34 @@
+@@ -10,14 +10,36 @@
# Use a 4096 bit RSA key instead of 2048
rsa-key-size = 4096
++# To test you should use first the staging server.
++# If everything is in order you must change back to production server.
+# The staging/testing server
-+server = https://acme-staging.api.letsencrypt.org/directory
++# server = https://acme-staging.api.letsencrypt.org/directory
+# The production server.
-+# server = https://acme-v01.api.letsencrypt.org/directory
++server = https://acme-v01.api.letsencrypt.org/directory
+
# Uncomment and update to register with the specified e-mail address
# email = foo(a)example.com
1
0
Hello community,
here is the log from the commit of package trace-cmd for openSUSE:Factory checked in at 2017-08-29 11:45:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trace-cmd (Old)
and /work/SRC/openSUSE:Factory/.trace-cmd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trace-cmd"
Tue Aug 29 11:45:30 2017 rev:10 rq:519136 version:2.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/trace-cmd/trace-cmd.changes 2016-10-18 10:39:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.trace-cmd.new/trace-cmd.changes 2017-08-29 11:46:50.784931399 +0200
@@ -1,0 +2,17 @@
+Mon Aug 28 12:35:58 UTC 2017 - mgorman(a)suse.com
+
+- Upgrade to version 2.6.1
+
+ - Improved robust handling of malloc failures and corrupted input
+ - Improved graphing support
+ - Fix bug due to double frees
+ - Fix output format oddities
+ - Add filtering of specific pids
+ - Add bash-completion handler
+ - New option: --max-graph-depth to limit graph depth
+ - New option: -I remove interrupts from trace
+ - New option: -S remove softirqs from trace
+ - New option: --ts2secs to convert cycles into seconds
+ - Updated makefile-lib64.patch to match upstream Makefile changes
+
+-------------------------------------------------------------------
Old:
----
trace-cmd-2.6.tar.bz2
New:
----
trace-cmd-2.6.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trace-cmd.spec ++++++
--- /var/tmp/diff_new_pack.VbBO3z/_old 2017-08-29 11:46:52.792648401 +0200
+++ /var/tmp/diff_new_pack.VbBO3z/_new 2017-08-29 11:46:52.800647273 +0200
@@ -1,7 +1,7 @@
#
# spec file for package trace-cmd
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -21,7 +21,7 @@
Summary: Configuration tool for Ftrace
License: GPL-2.0 and LGPL-2.1
Group: Development/Tools/Debuggers
-Version: 2.6
+Version: 2.6.1
Release: 0
Source0: trace-cmd-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -70,6 +70,8 @@
%{_mandir}/man1/trace-cmd*
%{_mandir}/man1/kernelshark*
%{_mandir}/man5/trace-cmd.dat*
+/etc/bash_completion.d/trace-cmd.bash
+%doc COPYING
%files -n kernelshark
%defattr(-,root,root)
++++++ makefile-lib64.patch ++++++
--- /var/tmp/diff_new_pack.VbBO3z/_old 2017-08-29 11:46:52.856639381 +0200
+++ /var/tmp/diff_new_pack.VbBO3z/_new 2017-08-29 11:46:52.860638818 +0200
@@ -6,18 +6,18 @@
1 file changed, 5 insertions(+)
diff --git a/Makefile b/Makefile
-index a21a43eb0096..8a4587e7fe48 100644
+index d3dfa11d4867..dd5a5c80d09f 100644
--- a/Makefile
+++ b/Makefile
-@@ -48,6 +48,11 @@ html_install_SQ = '$(subst ','\'',$(html_install))'
- img_install = $(prefix)/share/kernelshark/html/images
+@@ -49,6 +49,11 @@ img_install = $(prefix)/share/kernelshark/html/images
img_install_SQ = '$(subst ','\'',$(img_install))'
- libdir ?= lib
+ libdir ?= $(prefix)/lib
+ libdir_SQ = '$(subst ','\'',$(libdir))'
+ifeq ($(prefix),/usr)
+ ifeq ($(shell getconf LONG_BIT),64)
-+ libdir = lib64
++ libdir = ${prefix}/lib64
+ endif
+endif
+ includedir = $(prefix)/include/trace-cmd
+ includedir_SQ = '$(subst ','\'',$(includedir))'
- export man_dir man_dir_SQ html_install html_install_SQ INSTALL
- export img_install img_install_SQ
++++++ trace-cmd-2.6.tar.bz2 -> trace-cmd-2.6.1.tar.bz2 ++++++
++++ 10552 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package cava for openSUSE:Factory checked in at 2017-08-29 11:45:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cava (Old)
and /work/SRC/openSUSE:Factory/.cava.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cava"
Tue Aug 29 11:45:25 2017 rev:4 rq:519129 version:0.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/cava/cava.changes 2017-08-22 11:10:03.412756892 +0200
+++ /work/SRC/openSUSE:Factory/.cava.new/cava.changes 2017-08-29 11:46:41.558231953 +0200
@@ -1,0 +2,11 @@
+Mon Aug 28 13:02:45 UTC 2017 - mvetter(a)suse.com
+
+- Update to 0.6.0:
+ * Autosens of low values (dynamic range)
+ * Removed config parameter 'overshoot'
+ * Removed config parameter 'mode'
+ * New config parameter 'waves'
+ * Changed config parameter 'style' to 'channels' (was either 'mono' or 'stereo' anyway)
+ * Parameters 'integral' and 'gravity' are now in percentage
+
+-------------------------------------------------------------------
Old:
----
0.5.0.tar.gz
New:
----
0.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cava.spec ++++++
--- /var/tmp/diff_new_pack.j04gQH/_old 2017-08-29 11:46:42.482101728 +0200
+++ /var/tmp/diff_new_pack.j04gQH/_new 2017-08-29 11:46:42.482101728 +0200
@@ -17,7 +17,7 @@
Name: cava
-Version: 0.5.0
+Version: 0.6.0
Release: 0
Summary: Console-based Audio Visualizer for Alsa
License: MIT
++++++ 0.5.0.tar.gz -> 0.6.0.tar.gz ++++++
++++ 1729 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package machinery for openSUSE:Factory checked in at 2017-08-29 11:45:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/machinery (Old)
and /work/SRC/openSUSE:Factory/.machinery.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "machinery"
Tue Aug 29 11:45:20 2017 rev:14 rq:519128 version:1.23.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/machinery/machinery.changes 2017-06-22 11:21:27.038430212 +0200
+++ /work/SRC/openSUSE:Factory/.machinery.new/machinery.changes 2017-08-29 11:46:34.215266990 +0200
@@ -1,0 +2,7 @@
+Mon Aug 28 14:59:52 CEST 2017 - thardeck(a)suse.de
+
+- update to version 1.23.0
+ * Support inspection of ppc64 systems (bnc#1052877)
+- tracking bug (bnc#1055250)
+
+-------------------------------------------------------------------
Old:
----
machinery-tool-1.22.3.gem
New:
----
machinery-tool-1.23.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ machinery.spec ++++++
--- /var/tmp/diff_new_pack.3F9gYY/_old 2017-08-29 11:46:35.791044874 +0200
+++ /var/tmp/diff_new_pack.3F9gYY/_new 2017-08-29 11:46:35.819040927 +0200
@@ -17,7 +17,7 @@
Name: machinery
-Version: 1.22.3
+Version: 1.23.0
Release: 0
%define binary_name machinery
%define mod_name machinery-tool
++++++ machinery-tool-1.22.3.gem -> machinery-tool-1.23.0.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.git_revision new/.git_revision
--- old/.git_revision 2017-06-20 10:51:52.000000000 +0200
+++ new/.git_revision 2017-06-20 10:58:58.000000000 +0200
@@ -1 +1 @@
-167aca702b5ff5775557ae8df47026e67035f8e7
\ No newline at end of file
+85d9944eadf522d74bb0d32586a007c1d02d6abd
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NEWS new/NEWS
--- old/NEWS 2017-06-20 10:51:52.000000000 +0200
+++ new/NEWS 2017-06-20 10:58:58.000000000 +0200
@@ -1,6 +1,10 @@
# Machinery Release Notes
+## Version 1.23.0 - Mon Aug 28 14:59:52 CEST 2017 - thardeck(a)suse.de
+
+* Support inspection of ppc64 systems (bnc#1052877)
+
## Version 1.22.3 - Tue Jun 20 10:56:18 CEST 2017 - thardeck(a)suse.de
* Gracefully handle incorrect filter pathes in the experimental filtering function
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/version.rb new/lib/version.rb
--- old/lib/version.rb 2017-06-20 10:51:52.000000000 +0200
+++ new/lib/version.rb 2017-06-20 10:58:58.000000000 +0200
@@ -17,6 +17,6 @@
module Machinery
- VERSION = "1.22.3"
+ VERSION = "1.23.0"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/machinery-helper/version.go new/machinery-helper/version.go
--- old/machinery-helper/version.go 2017-06-20 10:51:52.000000000 +0200
+++ new/machinery-helper/version.go 2017-06-20 10:58:58.000000000 +0200
@@ -2,4 +2,4 @@
package main
-const VERSION = "167aca702b5ff5775557ae8df47026e67035f8e7"
+const VERSION = "85d9944eadf522d74bb0d32586a007c1d02d6abd"
Binary files old/man/generated/machinery.1.gz and new/man/generated/machinery.1.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/manual/site/sitemap.xml new/manual/site/sitemap.xml
--- old/manual/site/sitemap.xml 2017-06-20 10:51:52.000000000 +0200
+++ new/manual/site/sitemap.xml 2017-06-20 10:58:58.000000000 +0200
@@ -4,7 +4,7 @@
<url>
<loc>/docs/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
@@ -12,7 +12,7 @@
<url>
<loc>/machinery_main_general.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
@@ -20,7 +20,7 @@
<url>
<loc>/machinery_main_scopes.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
@@ -28,7 +28,7 @@
<url>
<loc>/machinery_main_usecases.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
@@ -36,7 +36,7 @@
<url>
<loc>/machinery_main_security_implications.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
@@ -45,115 +45,115 @@
<url>
<loc>/machinery-analyze.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-build.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-compare.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-config.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-copy.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-deploy.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-export-autoyast.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-export-kiwi.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-export-html.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-inspect.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-inspect-container.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-list.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-man.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-move.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-remove.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-serve.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-show.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-upgrade-format.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>/machinery-validate.1/</loc>
- <lastmod>2017-06-20</lastmod>
+ <lastmod>2017-08-28</lastmod>
<changefreq>daily</changefreq>
</url>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2017-06-20 10:57:15.000000000 +0200
+++ new/metadata 2017-08-28 15:00:48.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: machinery-tool
version: !ruby/object:Gem::Version
- version: 1.22.3
+ version: 1.23.0
platform: ruby
authors:
- SUSE
autorequire:
bindir: bin
cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: cheetah
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools/go.rb new/tools/go.rb
--- old/tools/go.rb 2017-06-20 10:51:52.000000000 +0200
+++ new/tools/go.rb 2017-06-20 10:58:58.000000000 +0200
@@ -25,11 +25,11 @@
when version <= 1.4
["i686", "x86_64"].include?(local_arch) ? [local_arch] : []
when version == 1.6 && suse_package_includes_s390?
- ["i686", "x86_64", "ppc64le", "s390x", "armv6l", "armv7l", "aarch64"]
+ ["i686", "x86_64", "ppc64le", "ppc64", "s390x", "armv6l", "armv7l", "aarch64"]
when version <= 1.6
- ["i686", "x86_64", "ppc64le", "armv6l", "armv7l", "aarch64"]
+ ["i686", "x86_64", "ppc64le", "ppc64", "armv6l", "armv7l", "aarch64"]
when version >= 1.7
- ["i686", "x86_64", "ppc64le", "s390x", "armv6l", "armv7l", "aarch64"]
+ ["i686", "x86_64", "ppc64le", "ppc64", "s390x", "armv6l", "armv7l", "aarch64"]
end
end
1
0
Hello community,
here is the log from the commit of package opa-ff for openSUSE:Factory checked in at 2017-08-29 11:45:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opa-ff (Old)
and /work/SRC/openSUSE:Factory/.opa-ff.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opa-ff"
Tue Aug 29 11:45:18 2017 rev:2 rq:519124 version:10.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/opa-ff/opa-ff.changes 2017-08-12 20:25:01.246372812 +0200
+++ /work/SRC/openSUSE:Factory/.opa-ff.new/opa-ff.changes 2017-08-29 11:46:18.665458847 +0200
@@ -1,0 +2,11 @@
+Mon Aug 28 12:01:45 UTC 2017 - nmoreychaisemartin(a)suse.com
+
+- Updates patches to latest sources:
+ * opa-ff_fix_suse_build_issue.patch replaced by
+ opa-ff-suse-build-fixes.patch
+ * 0001-Add-shebang-for-exp-files.patch replaced by
+ opa-ff-add-shebang-for-exp-files.patch
+- Add opa-ff-sigset-was-removed.patch to build with the latest glibc
+ which does not expose <bits/sigset.h> anymore
+
+-------------------------------------------------------------------
Old:
----
0001-Add-shebang-for-exp-files.patch
opa-ff_fix_suse_build_issue.patch
New:
----
opa-ff-add-shebang-for-exp-files.patch
opa-ff-sigset-was-removed.patch
opa-ff-suse-build-fixes.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opa-ff.spec ++++++
--- /var/tmp/diff_new_pack.8ZVmsD/_old 2017-08-29 11:46:21.449066476 +0200
+++ /var/tmp/diff_new_pack.8ZVmsD/_new 2017-08-29 11:46:21.497059711 +0200
@@ -1,7 +1,7 @@
#
# spec file for package opa-ff
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -27,17 +27,18 @@
Url: http://www.intel.com/
Source: opa-ff-%{version}.tar.gz
Source1: opa-ff.rpmlintrc
-Patch1: opa-ff_fix_suse_build_issue.patch
-Patch2: 0001-Add-shebang-for-exp-files.patch
+Patch1: opa-ff-add-shebang-for-exp-files.patch
+Patch2: opa-ff-suse-build-fixes.patch
+Patch3: opa-ff-sigset-was-removed.patch
BuildRequires: gcc-c++
+BuildRequires: infiniband-diags-devel
BuildRequires: libexpat-devel
-BuildRequires: rdma-core-devel
-BuildRequires: librdmacm1
BuildRequires: libopenssl-devel
+BuildRequires: librdmacm1
BuildRequires: ncurses-devel
+BuildRequires: rdma-core-devel
BuildRequires: tcl-devel
BuildRequires: zlib-devel
-BuildRequires: infiniband-diags-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Currently ONLY builds on x86_64
@@ -77,8 +78,8 @@
%package -n opa-address-resolution-devel
Summary: Development files for the Address Resolution manager
Group: Development/Libraries/C and C++
-Requires: opa-basic-tools
Requires: opa-address-resolution = %{version}
+Requires: opa-basic-tools
%description -n opa-address-resolution-devel
This package contains the include files and libraries
@@ -88,6 +89,7 @@
%setup -q -n opa-ff-%{version}
%patch1
%patch2
+%patch3
%build
export RPM_OPT_FLAGS
@@ -134,7 +136,6 @@
%define release_string IntelOPA-Tools-FF.$BUILD_TARGET_OS_ID.$MODULEVERSION
-
#rm -rf $RPM_BUILD_ROOT
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sbindir}
@@ -208,7 +209,6 @@
cp -t %{buildroot}%{_libdir}/ibacm libdsap.so.*
ln -s libdsap.so.* %{buildroot}%{_libdir}/ibacm/libdsap.so
-
ln -s /etc/opa/sysconfig/allhosts %{buildroot}/etc/sysconfig/opa/allhosts
ln -s /etc/opa/sysconfig/chassis %{buildroot}/etc/sysconfig/opa/chassis
ln -s /etc/opa/sysconfig/esm_chassis %{buildroot}//etc/sysconfig/opa/esm_chassis
@@ -288,7 +288,6 @@
#cd /opt/opa/src/mpi_apps >/dev/null 2>&1
#make -k clean >/dev/null 2>&1 || : # suppress all errors and return codes from the make clean.
-
%post -n opa-address-resolution -p /sbin/ldconfig
%postun -n opa-address-resolution -p /sbin/ldconfig
++++++ opa-ff-add-shebang-for-exp-files.patch ++++++
diff --git IbaTools/FastFabric/chassis_configure.exp IbaTools/FastFabric/chassis_configure.exp
index f18397f..38fb6d9 100644
--- IbaTools/FastFabric/chassis_configure.exp
+++ IbaTools/FastFabric/chassis_configure.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/chassis_fmconfig.exp IbaTools/FastFabric/chassis_fmconfig.exp
index 986d799..ed26fe5 100755
--- IbaTools/FastFabric/chassis_fmconfig.exp
+++ IbaTools/FastFabric/chassis_fmconfig.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/chassis_fmcontrol.exp IbaTools/FastFabric/chassis_fmcontrol.exp
index ea3d546..5c67c2f 100755
--- IbaTools/FastFabric/chassis_fmcontrol.exp
+++ IbaTools/FastFabric/chassis_fmcontrol.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/chassis_fmgetconfig.exp IbaTools/FastFabric/chassis_fmgetconfig.exp
index dff298e..75b8abc 100755
--- IbaTools/FastFabric/chassis_fmgetconfig.exp
+++ IbaTools/FastFabric/chassis_fmgetconfig.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
index 99c38c1..cf63eac 100755
--- IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
+++ IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/chassis_fmsecurityfiles.exp IbaTools/FastFabric/chassis_fmsecurityfiles.exp
index b45aff1..a650423 100755
--- IbaTools/FastFabric/chassis_fmsecurityfiles.exp
+++ IbaTools/FastFabric/chassis_fmsecurityfiles.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/chassis_getconfig.exp IbaTools/FastFabric/chassis_getconfig.exp
index 7454afc..f4415f1 100644
--- IbaTools/FastFabric/chassis_getconfig.exp
+++ IbaTools/FastFabric/chassis_getconfig.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/chassis_reboot.exp IbaTools/FastFabric/chassis_reboot.exp
index f59330f..c2ca75f 100755
--- IbaTools/FastFabric/chassis_reboot.exp
+++ IbaTools/FastFabric/chassis_reboot.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/chassis_upgrade.exp IbaTools/FastFabric/chassis_upgrade.exp
index c255e01..b2a798a 100755
--- IbaTools/FastFabric/chassis_upgrade.exp
+++ IbaTools/FastFabric/chassis_upgrade.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/configipoib.exp IbaTools/FastFabric/configipoib.exp
index 7918866..e1207d4 100755
--- IbaTools/FastFabric/configipoib.exp
+++ IbaTools/FastFabric/configipoib.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/ff_function.exp IbaTools/FastFabric/ff_function.exp
index 3590661..c151b90 100755
--- IbaTools/FastFabric/ff_function.exp
+++ IbaTools/FastFabric/ff_function.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/ipoibping.exp IbaTools/FastFabric/ipoibping.exp
index 17b0486..5520c4b 100755
--- IbaTools/FastFabric/ipoibping.exp
+++ IbaTools/FastFabric/ipoibping.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/load.exp IbaTools/FastFabric/load.exp
index 91991e0..894ede3 100755
--- IbaTools/FastFabric/load.exp
+++ IbaTools/FastFabric/load.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/mpiperf.exp IbaTools/FastFabric/mpiperf.exp
index 630dc66..5e1cb17 100755
--- IbaTools/FastFabric/mpiperf.exp
+++ IbaTools/FastFabric/mpiperf.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/mpiperfdeviation.exp IbaTools/FastFabric/mpiperfdeviation.exp
index a7fc679..ebdf07e 100755
--- IbaTools/FastFabric/mpiperfdeviation.exp
+++ IbaTools/FastFabric/mpiperfdeviation.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/reboot.exp IbaTools/FastFabric/reboot.exp
index f27b50a..03d98ce 100755
--- IbaTools/FastFabric/reboot.exp
+++ IbaTools/FastFabric/reboot.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/sacache.exp IbaTools/FastFabric/sacache.exp
index 40a0340..20ef370 100755
--- IbaTools/FastFabric/sacache.exp
+++ IbaTools/FastFabric/sacache.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/switch_capture.exp IbaTools/FastFabric/switch_capture.exp
index ed149a3..85e20f6 100755
--- IbaTools/FastFabric/switch_capture.exp
+++ IbaTools/FastFabric/switch_capture.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/switch_configure.exp IbaTools/FastFabric/switch_configure.exp
index 3516482..5098119 100644
--- IbaTools/FastFabric/switch_configure.exp
+++ IbaTools/FastFabric/switch_configure.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/switch_dump.exp IbaTools/FastFabric/switch_dump.exp
index b567f26..4ab77db 100755
--- IbaTools/FastFabric/switch_dump.exp
+++ IbaTools/FastFabric/switch_dump.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/switch_fwverify.exp IbaTools/FastFabric/switch_fwverify.exp
index 6be1ea9..587c07a 100755
--- IbaTools/FastFabric/switch_fwverify.exp
+++ IbaTools/FastFabric/switch_fwverify.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
diff --git IbaTools/FastFabric/switch_getconfig.exp IbaTools/FastFabric/switch_getconfig.exp
index a1cbaae..e79b250 100755
--- IbaTools/FastFabric/switch_getconfig.exp
+++ IbaTools/FastFabric/switch_getconfig.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
diff --git IbaTools/FastFabric/switch_hwvpd.exp IbaTools/FastFabric/switch_hwvpd.exp
index 24fa8a5..85eafb4 100755
--- IbaTools/FastFabric/switch_hwvpd.exp
+++ IbaTools/FastFabric/switch_hwvpd.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
diff --git IbaTools/FastFabric/switch_info.exp IbaTools/FastFabric/switch_info.exp
index 73ef67a..22eb450 100755
--- IbaTools/FastFabric/switch_info.exp
+++ IbaTools/FastFabric/switch_info.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
diff --git IbaTools/FastFabric/switch_ping.exp IbaTools/FastFabric/switch_ping.exp
index 04f060e..d4ed0bf 100755
--- IbaTools/FastFabric/switch_ping.exp
+++ IbaTools/FastFabric/switch_ping.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
diff --git IbaTools/FastFabric/switch_reboot.exp IbaTools/FastFabric/switch_reboot.exp
index 81f4e3e..d6338be 100755
--- IbaTools/FastFabric/switch_reboot.exp
+++ IbaTools/FastFabric/switch_reboot.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/switch_upgrade.exp IbaTools/FastFabric/switch_upgrade.exp
index 81bd9b4..45f576c 100755
--- IbaTools/FastFabric/switch_upgrade.exp
+++ IbaTools/FastFabric/switch_upgrade.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git IbaTools/FastFabric/upgrade.exp IbaTools/FastFabric/upgrade.exp
index aecccbb..8f8bc93 100755
--- IbaTools/FastFabric/upgrade.exp
+++ IbaTools/FastFabric/upgrade.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/basic.exp TestTools/basic.exp
index 4ffe1f5..2d473b5 100755
--- TestTools/basic.exp
+++ TestTools/basic.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/chassis.exp TestTools/chassis.exp
index 9af2e9a..60b79a8 100755
--- TestTools/chassis.exp
+++ TestTools/chassis.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/common_funcs.exp TestTools/common_funcs.exp
index 68d55d8..39bce9a 100644
--- TestTools/common_funcs.exp
+++ TestTools/common_funcs.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/defs.exp TestTools/defs.exp
index 8e1a8e6..eed572f 100644
--- TestTools/defs.exp
+++ TestTools/defs.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/extmng.exp TestTools/extmng.exp
index 2f2d25e..e571529 100755
--- TestTools/extmng.exp
+++ TestTools/extmng.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/ib.exp TestTools/ib.exp
index 06c4a6e..45b6309 100755
--- TestTools/ib.exp
+++ TestTools/ib.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/ibtools.exp TestTools/ibtools.exp
index 36b945c..1b88094 100644
--- TestTools/ibtools.exp
+++ TestTools/ibtools.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/install.exp TestTools/install.exp
index 7736765..e7cc0d4 100755
--- TestTools/install.exp
+++ TestTools/install.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/mpi.exp TestTools/mpi.exp
index 3c5a649..d16354a 100755
--- TestTools/mpi.exp
+++ TestTools/mpi.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/network.exp TestTools/network.exp
index a859022..0f02d36 100755
--- TestTools/network.exp
+++ TestTools/network.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/opa_to_xml.exp TestTools/opa_to_xml.exp
index e5e8ab8..5a110c4 100644
--- TestTools/opa_to_xml.exp
+++ TestTools/opa_to_xml.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/proc_mgr.exp TestTools/proc_mgr.exp
index abcb65d..be47d2f 100755
--- TestTools/proc_mgr.exp
+++ TestTools/proc_mgr.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/sm_control.exp TestTools/sm_control.exp
index 7f08ccb..4809f4c 100755
--- TestTools/sm_control.exp
+++ TestTools/sm_control.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/switch_methods.exp TestTools/switch_methods.exp
index 9f13773..6f0d730 100644
--- TestTools/switch_methods.exp
+++ TestTools/switch_methods.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/target.exp TestTools/target.exp
index 9460a67..2c300f9 100755
--- TestTools/target.exp
+++ TestTools/target.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
diff --git TestTools/tools.exp TestTools/tools.exp
index 850e789..92c94c2 100755
--- TestTools/tools.exp
+++ TestTools/tools.exp
@@ -1,3 +1,4 @@
+#!/usr/bin/env expect
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015, Intel Corporation
++++++ opa-ff-sigset-was-removed.patch ++++++
diff --git Esm/ib/src/ibaccess/vs_thr.c Esm/ib/src/ibaccess/vs_thr.c
index 82f30ca..e9281f4 100755
--- Esm/ib/src/ibaccess/vs_thr.c
+++ Esm/ib/src/ibaccess/vs_thr.c
@@ -51,11 +51,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* SFW 03/10/02 Initial functions all passing testcases.
* MGR 04/19/02 Changed pthread_kill call to pthread_cancel.
***********************************************************************/
-//#if defined(LINT)
+#if defined(LINT)
#include <pthread.h>
#define __signed__ signed
#include <bits/sigset.h>
-//#endif
+#endif
#include <stdio.h>
#include <sys/types.h>
#include <unistd.h>
++++++ opa-ff-suse-build-fixes.patch ++++++
diff --git Makerules/Defs.Flags Makerules/Defs.Flags
index 8caba53..91764ca 100755
--- Makerules/Defs.Flags
+++ Makerules/Defs.Flags
@@ -53,8 +53,8 @@ CCDEPENDFLAGS = $(CCFLAGS) $(DEPENDENV) $(DEPENDPROJ) $(DEPENDMOD) $(DEPENDLOCA
CINCLUDE_DIRS = $(LOCAL_INCLUDE_DIRS) $(MOD_INCLUDE_DIRS) $(PROJ_INCLUDE_DIRS) $(SYS_INCLUDE_DIRS)
ifndef KERNELRELEASE
-CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH)
-CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH)
+CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS)
+CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS)
LDFLAGS = $(LDMACH) $(LDSYS) $(LDENV) $(LDPROJ) $(LDMOD) $(LDLOCAL) $(LDLIBSRCH) $(LDSTRIP) $(LDOUTPUT)
LD_LIB_DIRS = $(LOCAL_LIB_DIRS) $(MOD_LIB_DIRS) $(PROJ_LIB_DIRS) $(SYS_LIB_DIRS)
diff --git Makerules/Target.LINUX.INTEL.X86_64 Makerules/Target.LINUX.INTEL.X86_64
index a373262..3a6687d 100755
--- Makerules/Target.LINUX.INTEL.X86_64
+++ Makerules/Target.LINUX.INTEL.X86_64
@@ -132,6 +132,7 @@ endif
endif
CKERNEL+=-include $(TL_DIR)/Makerules/LINUX/$(BUILD_TARGET).$(BUILD_TARGET_OS_VENDOR).$(BUILD_TARGET_OS_VERSION).h
+CKERNEL+= $(RPM_OPT_FLAGS)
# Include directories for kernel
KERNELDIR=/lib/modules/$(BUILD_TARGET_OS_VERSION)/build
diff --git OpenIb_Host/ff_build.sh OpenIb_Host/ff_build.sh
index b6a17a0..028a234 100755
--- OpenIb_Host/ff_build.sh
+++ OpenIb_Host/ff_build.sh
@@ -65,7 +65,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF}
# for FF the kernel rev is not important. We simply use the kernel rev
# of the running kernel. While BUILD_TARGET_OS_VERSION is needed by Makerules
# it will have no impact on what is actually built for FF
-export BUILD_TARGET_OS_VERSION=${BUILD_TARGET_OS_VERSION:-`uname -r`}
+export BUILD_TARGET_OS_VERSION=`uname -r`
+export BUILD_PLATFORM_OS_VENDOR="SuSE"
+export BUILD_TARGET_OS_VENDOR="SuSE"
+export BUILD_PLATFORM_OS_VENDOR_VERSION="OPENSUSE_BUILD_SYSTEM"
+export BUILD_TARGET_OS_VENDOR=$BUILD_PLATFORM_OS_VENDOR
+export BUILD_TARGET_OS_VENDOR_VERSION=$BUILD_PLATFORM_OS_VENDOR_VERSION
+
setver $BUILD_TARGET_OS_VENDOR $BUILD_TARGET_OS_VERSION
RELEASE_STRING=IntelOPA-Tools-FF.$BUILD_TARGET_OS_ID.$MODULEVERSION
@@ -76,6 +82,7 @@ shift
set -x
{
echo "Environment:"
+ export BUILD_TARGET_OS_VERSION="4.4"
env
echo "----------------------------------------------------------------------------"
echo
1
0
Hello community,
here is the log from the commit of package opa-fm for openSUSE:Factory checked in at 2017-08-29 11:45:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opa-fm (Old)
and /work/SRC/openSUSE:Factory/.opa-fm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opa-fm"
Tue Aug 29 11:45:10 2017 rev:5 rq:519122 version:10.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/opa-fm/opa-fm.changes 2017-08-13 14:57:53.051785975 +0200
+++ /work/SRC/openSUSE:Factory/.opa-fm.new/opa-fm.changes 2017-08-29 11:46:09.414762809 +0200
@@ -1,0 +2,10 @@
+Mon Aug 28 12:08:54 UTC 2017 - nmoreychaisemartin(a)suse.com
+
+- Update patches to latest sources:
+ * opa-fm-use-RPM_OPT_FLAGS.patch
+ * 0001-Fall-back-to-custom-vendor-if-os_vendor-fails.patch was renamed
+ to opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch
+- Add opa-fm-sigset-was-removed.patch to build with the latest glibc
+ which does not expose <bits/sigset.h> anymore
+
+-------------------------------------------------------------------
Old:
----
0001-Fall-back-to-custom-vendor-if-os_vendor-fails.patch
New:
----
opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch
opa-fm-sigset-was-removed.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opa-fm.spec ++++++
--- /var/tmp/diff_new_pack.3wqo7F/_old 2017-08-29 11:46:11.110523777 +0200
+++ /var/tmp/diff_new_pack.3wqo7F/_new 2017-08-29 11:46:11.122522085 +0200
@@ -28,8 +28,9 @@
Url: http://www.intel.com/
Source: opa-fm-%{version}.tar.gz
Source1: %{name}-rpmlintrc
-Patch1: 0001-Fall-back-to-custom-vendor-if-os_vendor-fails.patch
+Patch1: opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch
Patch2: opa-fm-use-RPM_OPT_FLAGS.patch
+Patch3: opa-fm-sigset-was-removed.patch
BuildRequires: gcc-c++
BuildRequires: infiniband-diags-devel
BuildRequires: libexpat-devel
@@ -51,8 +52,9 @@
%prep
%setup -q -n %{name}-%{version}
-%patch1 -p1
-%patch2 -p1
+%patch1
+%patch2
+%patch3
%build
export RPM_OPT_FLAGS
++++++ opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch ++++++
diff --git MakeTools/funcs-ext.sh MakeTools/funcs-ext.sh
index afeeba9..62c96fe 100755
--- MakeTools/funcs-ext.sh
+++ MakeTools/funcs-ext.sh
@@ -711,27 +711,32 @@ function os_vendor()
rval=apple
else
filelist=`'ls' /etc/*-release | egrep -v lsb | egrep -v os`
- rval=""
- for file in $filelist
- do
- if [ -f $file ]
- then
- rval=`basename $file -release`
- if [ $rval = 'SuSE' ]
- then
- if [ -f /etc/UnitedLinux-release ]
- then
- rval=UnitedLinux
- fi
- elif [ $rval = 'centos' ]
- then
- rval=redhat
- elif [ $rval != 'os' ]
- then
- break
- fi
- fi
- done
+ if [ $? == 1 ]
+ then
+ rval="custom"
+ else
+ rval=""
+ for file in $filelist
+ do
+ if [ -f $file ]
+ then
+ rval=`basename $file -release`
+ if [ $rval = 'SuSE' ]
+ then
+ if [ -f /etc/UnitedLinux-release ]
+ then
+ rval=UnitedLinux
+ fi
+ elif [ $rval = 'centos' ]
+ then
+ rval=redhat
+ elif [ $rval != 'os' ]
+ then
+ break
+ fi
+ fi
+ done
+ fi
fi
echo $rval
}
++++++ opa-fm-sigset-was-removed.patch ++++++
diff --git Esm/ib/src/ibaccess/vs_thr.c Esm/ib/src/ibaccess/vs_thr.c
index 82f30ca..e9281f4 100755
--- Esm/ib/src/ibaccess/vs_thr.c
+++ Esm/ib/src/ibaccess/vs_thr.c
@@ -51,11 +51,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* SFW 03/10/02 Initial functions all passing testcases.
* MGR 04/19/02 Changed pthread_kill call to pthread_cancel.
***********************************************************************/
-//#if defined(LINT)
+#if defined(LINT)
#include <pthread.h>
#define __signed__ signed
#include <bits/sigset.h>
-//#endif
+#endif
#include <stdio.h>
#include <sys/types.h>
#include <unistd.h>
++++++ opa-fm-use-RPM_OPT_FLAGS.patch ++++++
--- /var/tmp/diff_new_pack.3wqo7F/_old 2017-08-29 11:46:11.446476422 +0200
+++ /var/tmp/diff_new_pack.3wqo7F/_new 2017-08-29 11:46:11.450475858 +0200
@@ -1,8 +1,8 @@
-diff --git a/Esm/Makerules.project b/Esm/Makerules.project
-index 4f33920..ffaf826 100755
---- a/Esm/Makerules.project
-+++ b/Esm/Makerules.project
-@@ -124,6 +124,7 @@ BSCPROJ =
+diff --git Esm/Makerules.project Esm/Makerules.project
+index e4a8887..f3ca78e 100755
+--- Esm/Makerules.project
++++ Esm/Makerules.project
+@@ -125,6 +125,7 @@ BSCPROJ =
# strict-prototypes - treat extern int foo() as function with no args
CPROJ = -DPRODUCT=$(PRODUCT) -DPRODUCT_$(PRODUCT) -DMODULEVERSION=$(MODULEVERSION)
@@ -10,10 +10,10 @@
ifeq ($(IB_STACK),OPENIB)
CPROJ += -DIB_STACK_OPENIB
else
-diff --git a/MakeTools/patch_version/Makefile b/MakeTools/patch_version/Makefile
+diff --git MakeTools/patch_version/Makefile MakeTools/patch_version/Makefile
index de6338c..2b7abde 100755
---- a/MakeTools/patch_version/Makefile
-+++ b/MakeTools/patch_version/Makefile
+--- MakeTools/patch_version/Makefile
++++ MakeTools/patch_version/Makefile
@@ -126,7 +126,7 @@ include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project
# (Windows Only)
#=============================================================================#
1
0
Hello community,
here is the log from the commit of package dosbox for openSUSE:Factory checked in at 2017-08-29 11:45:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dosbox (Old)
and /work/SRC/openSUSE:Factory/.dosbox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dosbox"
Tue Aug 29 11:45:07 2017 rev:30 rq:519121 version:0.74
Changes:
--------
--- /work/SRC/openSUSE:Factory/dosbox/dosbox.changes 2017-04-11 09:44:36.269816358 +0200
+++ /work/SRC/openSUSE:Factory/.dosbox.new/dosbox.changes 2017-08-29 11:45:57.596428712 +0200
@@ -1,0 +2,6 @@
+Mon Aug 28 12:26:06 UTC 2017 - lnussel(a)suse.de
+
+- Fix desktop file category to sort below Game (boo#1055340)
+- directly use desktop-file-install instead of the old macro
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dosbox.spec ++++++
--- /var/tmp/diff_new_pack.xEph5u/_old 2017-08-29 11:46:04.747420712 +0200
+++ /var/tmp/diff_new_pack.xEph5u/_new 2017-08-29 11:46:04.759419021 +0200
@@ -21,9 +21,9 @@
BuildRequires: SDL_sound-devel
BuildRequires: alsa-devel
BuildRequires: automake
+BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: libpng-devel
-BuildRequires: update-desktop-files
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(sdl)
%if 0%suse_version > 1020
@@ -86,7 +86,7 @@
rm -rf %{buildroot}%{_datadir}/doc/dosbox
install -d -m 755 %{buildroot}%{_datadir}/pixmaps
install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/dosbox.png
-%suse_update_desktop_file -i %name Emulator
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%files
%defattr(-,root,root)
++++++ dosbox.desktop ++++++
--- /var/tmp/diff_new_pack.xEph5u/_old 2017-08-29 11:46:04.963390270 +0200
+++ /var/tmp/diff_new_pack.xEph5u/_new 2017-08-29 11:46:04.967389705 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Application
+Categories=Game;Emulator;
Name=DOSBox
GenericName=DOS Emulator
Comment=DOS emulator well-suited for playing games
1
0
Hello community,
here is the log from the commit of package python-alembic for openSUSE:Factory checked in at 2017-08-29 11:45:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-alembic (Old)
and /work/SRC/openSUSE:Factory/.python-alembic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-alembic"
Tue Aug 29 11:45:05 2017 rev:27 rq:519120 version:0.9.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-alembic/python-alembic.changes 2017-02-06 15:22:52.390062450 +0100
+++ /work/SRC/openSUSE:Factory/.python-alembic.new/python-alembic.changes 2017-08-29 11:45:49.613553978 +0200
@@ -1,0 +2,16 @@
+Tue Aug 22 12:41:25 UTC 2017 - tbechtold(a)suse.com
+
+- update to 0.9.5:
+ * see http://alembic.zzzcomputing.com/en/latest/changelog.html#change-0.8.8
+ * see http://alembic.zzzcomputing.com/en/latest/changelog.html#change-0.8.9
+ * see http://alembic.zzzcomputing.com/en/latest/changelog.html#change-0.8.10
+ * see http://alembic.zzzcomputing.com/en/latest/changelog.html#change-0.9.0
+ * see http://alembic.zzzcomputing.com/en/latest/changelog.html#change-0.9.1
+ * see http://alembic.zzzcomputing.com/en/latest/changelog.html#change-0.9.2
+ * see http://alembic.zzzcomputing.com/en/latest/changelog.html#change-0.9.3
+ * see http://alembic.zzzcomputing.com/en/latest/changelog.html#change-0.9.4
+ * see http://alembic.zzzcomputing.com/en/latest/changelog.html#change-0.9.5
+- convert to singlespec
+- split -doc package
+
+-------------------------------------------------------------------
Old:
----
alembic-0.8.10.tar.gz
New:
----
alembic-0.9.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-alembic.spec ++++++
--- /var/tmp/diff_new_pack.jmkKVT/_old 2017-08-29 11:45:51.237325091 +0200
+++ /var/tmp/diff_new_pack.jmkKVT/_new 2017-08-29 11:45:51.241324527 +0200
@@ -16,8 +16,9 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-alembic
-Version: 0.8.10
+Version: 0.9.5
Release: 0
Url: http://bitbucket.org/zzzeek/alembic
Summary: A database migration tool for SQLAlchemy
@@ -25,27 +26,26 @@
Group: Development/Languages/Python
Source: https://pypi.io/packages/source/a/alembic/alembic-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: python-devel
-BuildRequires: python-setuptools
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
+BuildRequires: python-rpm-macros
# Test requirements:
-BuildRequires: python-Mako
-BuildRequires: python-SQLAlchemy >= 0.7.6
-BuildRequires: python-argparse
-BuildRequires: python-mock
-BuildRequires: python-nose >= 0.11
-BuildRequires: python-pytest-cov
-BuildRequires: python-python-editor >= 0.3
+BuildRequires: %{python_module Mako}
+BuildRequires: %{python_module SQLAlchemy >= 0.7.6}
+BuildRequires: %{python_module mock}
+BuildRequires: %{python_module nose >= 0.11}
+BuildRequires: %{python_module pytest-cov}
+BuildRequires: %{python_module python-dateutil}
+BuildRequires: %{python_module python-editor >= 0.3}
Requires: python-Mako
Requires: python-SQLAlchemy >= 0.7.6
-Requires: python-argparse
+Requires: python-python-dateutil
Requires: python-python-editor >= 0.3
Requires(post): /usr/sbin/update-alternatives
Requires(postun): /usr/sbin/update-alternatives
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
BuildArch: noarch
-%endif
+
+%python_subpackages
%description
Alembic is a new database migrations tool, written by the author
@@ -60,39 +60,53 @@
"downgrade" similarly, doing the same steps in reverse.
* Allows the scripts to execute in some sequential manner.
+%package -n python-alembic-doc
+Summary: Documentation for %{name}
+Group: Documentation/Other
+Provides: %{python_module alembic-doc = %{version}}
+
+%description -n python-alembic-doc
+Alembic is a new database migrations tool, written by the author
+of SQLAlchemy <http://www.sqlalchemy.org>. A migrations tool
+offers the following functionality:
+
+* Can emit ALTER statements to a database in order to change
+ the structure of tables and other constructs
+* Provides a system whereby "migration scripts" may be constructed;
+ each script indicates a particular series of steps that can "upgrade" a
+ target database to a new version, and optionally a series of steps that can
+ "downgrade" similarly, doing the same steps in reverse.
+* Allows the scripts to execute in some sequential manner.
+
+This package contains the documentation.
+
%prep
%setup -q -n alembic-%{version}
mv docs html && rm -rf html/build
%build
-python setup.py build
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-# update-alternatives
-mv %{buildroot}%{_bindir}/alembic %{buildroot}%{_bindir}/alembic-%{py_ver}
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-touch %{buildroot}%{_sysconfdir}/alternatives/alembic
-ln -sf %{_sysconfdir}/alternatives/alembic %{buildroot}%{_bindir}/alembic
+%python_install
+%python_clone -a %{buildroot}%{_bindir}/alembic
%check
-python setup.py test
+%python_exec setup.py test
%post
-update-alternatives \
- --install %{_bindir}/alembic alembic %{_bindir}/alembic-%{py_ver} 20
+%python_install_alternative alembic
%postun
-if [ $1 -eq 0 ] ; then
- update-alternatives --remove alembic %{_bindir}/alembic-%{py_ver}
-fi
+%python_uninstall_alternative alembic
-%files
+%files %{python_files}
%defattr(-,root,root,-)
-%doc CHANGES LICENSE README.rst html
-%ghost %{_sysconfdir}/alternatives/alembic
-%{_bindir}/alembic
-%{_bindir}/alembic-%{py_ver}
+%doc CHANGES LICENSE README.rst
+%python_alternative %{_bindir}/alembic
%{python_sitelib}/*
+%files -n python-alembic-doc
+%doc LICENSE html
+
%changelog
++++++ alembic-0.8.10.tar.gz -> alembic-0.9.5.tar.gz ++++++
++++ 52573 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package dovecot22 for openSUSE:Factory checked in at 2017-08-29 11:45:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dovecot22 (Old)
and /work/SRC/openSUSE:Factory/.dovecot22.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dovecot22"
Tue Aug 29 11:45:01 2017 rev:32 rq:519115 version:2.2.32
Changes:
--------
--- /work/SRC/openSUSE:Factory/dovecot22/dovecot22.changes 2017-07-04 09:11:30.693182653 +0200
+++ /work/SRC/openSUSE:Factory/.dovecot22.new/dovecot22.changes 2017-08-29 11:45:39.374997214 +0200
@@ -1,0 +2,109 @@
+Sun Aug 27 14:50:50 UTC 2017 - mrueckert(a)suse.de
+
+- update pigeonhole to 0.4.20
+ + Made the retention period for redirect duplicate identifiers
+ configurable. For accounts that perform many redirects, the
+ lda-dupes database could grow to impractical sizes. Changed the
+ default retention period from 24 to 12 hours.
+ - sieve-filter: Fixed memory leak: forgot to clean up script
+ binary at end of execution. Normally, this would merely be an
+ inconsequential memory leak. However, when the script comes
+ from an LDAP storage, this would cause io leak warnings.
+ - managesieve-login: Fixed handling of AUTHENTICATE command. A
+ second authenticate command would be parsed wrong. This problem
+ was caused by changes in the previous release.
+ - LDA Sieve plugin: Fixed minor memory leak caused by not
+ cleaning up the sieve_discard script.
+
+-------------------------------------------------------------------
+Thu Aug 24 15:56:03 UTC 2017 - mrueckert(a)suse.de
+
+- update to 2.2.32
+ * imapc: Info-level line is logged every time when successfully
+ connected to the remote server. This includes local/remote
+ IP/port, which can be useful for matching against external
+ logs.
+ * config: Log a warning if plugin { key=no } is used explicitly.
+ v2.3 will support "no" properly in plugin settings, but for now
+ any value at all for a boolean plugin setting is treated as
+ "yes", even if it's written as explicit "no". This change will
+ now warn that it most likely won't work as intended.
+ + Various optimizations to avoid accessing files/directories when
+ it's not necessary. Especially avoid accessing mail root
+ directories when INDEX directories point to a different
+ filesystem.
+ + mail_location can now include ITERINDEX parameter. This tells
+ Dovecot to perform mailbox listing from the INDEX path instead
+ of from the mail root path. It's mainly useful when the INDEX
+ storage is on a faster storage.
+ + mail_location can now include VOLATILEDIR=<path> parameter.
+ This is used for creating lock files and in future potentially
+ other files that don't need to exist permanently. The path
+ could point to tmpfs for example. This is especially useful to
+ avoid creating lock files to NFS or other remote filesystems.
+ For example:
+ mail_location=sdbox:~/sdbox:VOLATILEDIR=/tmp/volatile/%2.256Nu/%u
+ + mail_location's LISTINDEX=<path> can now contain a full path.
+ This allows storing mailbox list index to a different storage
+ than the rest of the indexes, for example to tmpfs.
+ + mail_location can now include NO-NOSELECT parameter. This
+ automatically deletes any \NoSelect mailboxes that have no
+ children. These mailboxes are sometimes confusing to users.
+ + mail_location can now include BROKENCHAR=<char> parameter.
+ This can be useful with imapc to access mailbox names that
+ aren't valid mUTF-7 charset from remote servers.
+ + If mailbox_list_index_very_dirty_syncs=yes, the list index is
+ no longer refreshed against filesystem when listing mailboxes.
+ This allows the mailbox listing to be done entirely by only
+ reading the mailbox list index.
+ + Added mailbox_list_index_include_inbox setting to control
+ whether INBOX's STATUS information should be cached in the
+ mailbox list index. The default is "no", but it may be useful
+ to change it to "yes", especially if LISTINDEX points to tmpfs.
+ + userdb can return chdir=<path>, which override mail_home for
+ the chdir location. This can be useful to avoid accessing home
+ directory on login.
+ + userdb can return postlogin=<socket> to specify per-user
+ imap/pop3 postlogin socket path.
+ + cassandra: Add support for result paging by adding
+ page_size=<n> parameter to the connect setting.
+ + dsync/imapc, pop3-migration plugin: Strip also trailing tabs
+ from headers when matching mails. This helps with migrations
+ from Zimbra.
+ + imap_logout_format supports now %{appended} and %{autoexpunged}
+ + virtual plugin: Optimize IDLE to use mailbox list index for
+ finding out when something has changed.
+ + Added apparmor plugin.
+ See https://wiki2.dovecot.org/Plugins/Apparmor
+ - virtual plugin: A lot of fixes. In many cases it was also
+ working very inefficiently or even incorrectly.
+ - imap: NOTIFY parameter parsing was incorrectly "fixed" in
+ v2.2.31. It was actually (mostly) working in previous
+ versions, but broken in v2.2.31.
+ - Modseq tracking didn't always work correctly. This could have
+ caused imap unhibernation to fail or IMAP QRESYNC/CONDSTORE
+ extensions to not work perfectly.
+ - mdbox: "Inconsistency in map index" wasn't fixed automatically
+ - dict-ldap: %variable values used in the LDAP filter weren't
+ escaped.
+ - quota=count: quota_warning = -storage=.. was never executed
+ (try #2). v2.2.31 fixed it for -messages, but not for
+ -storage.
+ - imapc: >= 32 kB mail bodies were supposed to be cached for
+ subsequent FETCHes, but weren't.
+ - quota-status service didn't support recipient_delimiter
+ - acl: Don't access dovecot-acl-list files with
+ acl_globals_only=yes
+ - mail_location: If INDEX dir is set, mailbox deletion deletes
+ its childrens' indexes. For example if "box" is deleted,
+ "box/child" index directory was deleted as well (but mails were
+ preserved).
+ - director: v2.2.31 caused rapid reconnection loops to directors
+ that were down.
+- drop patches:
+ de5d6bb50931ea243f582ace5a31abb11b619ffe.patch
+ bcb321bc62117d30bc53a872ca1154c0100aeefd.patch
+ 8b2d740b8182c63b76ff7ef0dd5e01710228705a.patch
+- new BR: libapparmor-devel
+
+-------------------------------------------------------------------
Old:
----
8b2d740b8182c63b76ff7ef0dd5e01710228705a.patch
bcb321bc62117d30bc53a872ca1154c0100aeefd.patch
de5d6bb50931ea243f582ace5a31abb11b619ffe.patch
dovecot-2.2-pigeonhole-0.4.19.tar.gz
dovecot-2.2.31.tar.gz
New:
----
dovecot-2.2-pigeonhole-0.4.20.tar.gz
dovecot-2.2.32.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dovecot22.spec ++++++
--- /var/tmp/diff_new_pack.ceM3iY/_old 2017-08-29 11:45:43.582404133 +0200
+++ /var/tmp/diff_new_pack.ceM3iY/_new 2017-08-29 11:45:43.590403005 +0200
@@ -17,11 +17,11 @@
Name: dovecot22
-Version: 2.2.31
+Version: 2.2.32
Release: 0
%define pkg_name dovecot
-%define dovecot_version 2.2.31
-%define dovecot_pigeonhole_version 0.4.19
+%define dovecot_version 2.2.32
+%define dovecot_pigeonhole_version 0.4.20
%define dovecot_branch 2.2
%define dovecot_pigeonhole_source_dir %{pkg_name}-%{dovecot_branch}-pigeonhole-%{dovecot_pigeonhole_version}
%define dovecot_pigeonhole_docdir %{_docdir}/%{pkg_name}/dovecot-pigeonhole
@@ -58,6 +58,7 @@
BuildRequires: bison
BuildRequires: cyrus-sasl-devel
BuildRequires: flex
+BuildRequires: libapparmor-devel
%if %{with icu}
BuildRequires: libicu-devel
%endif
@@ -129,9 +130,6 @@
Patch: dovecot-2.2.18-dont_use_etc_ssl_certs.patch
Patch1: dovecot-2.2.18-better_ssl_defaults.patch
Patch2: dovecot-2.2.31-dhparams_fips_mode.patch
-Patch3: bcb321bc62117d30bc53a872ca1154c0100aeefd.patch
-Patch4: 8b2d740b8182c63b76ff7ef0dd5e01710228705a.patch
-Patch5: de5d6bb50931ea243f582ace5a31abb11b619ffe.patch
Summary: IMAP and POP3 Server Written Primarily with Security in Mind
License: BSD-3-Clause and LGPL-2.1+ and MIT
Group: Productivity/Networking/Email/Servers
@@ -312,14 +310,12 @@
%patch -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%{__gzip} -9v ChangeLog
# Fix plugins dir.
%{__sed} -i 's|#mail_plugin_dir = /usr/lib/dovecot|mail_plugin_dir = %{_libdir}/dovecot/modules|' doc/example-config/conf.d/10-mail.conf
%build
+autoreconf -fi
export CFLAGS="%{optflags}"
%if %{with clucene}
export CFLAGS="$CFLAGS -I%{_libdir}"
@@ -337,6 +333,7 @@
--with-gssapi=plugin \
--with-pgsql \
--with-mysql \
+ --with-apparmor \
%if %{with sqlite}
--with-sqlite \
%endif
@@ -568,6 +565,7 @@
%dir %{_libdir}/%{pkg_name}
%dir %{_libdir}/%{pkg_name}/modules/
%{_libdir}/%{pkg_name}/modules/lib01_acl_plugin.so
+%{_libdir}/%{pkg_name}/modules/lib01_apparmor_plugin.so
%{_libdir}/%{pkg_name}/modules/lib02_lazy_expunge_plugin.so
%{_libdir}/%{pkg_name}/modules/lib05_mail_crypt_acl_plugin.so
%{_libdir}/%{pkg_name}/modules/lib05_pop3_migration_plugin.so
++++++ dovecot-2.2-pigeonhole-0.4.19.tar.gz -> dovecot-2.2-pigeonhole-0.4.20.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/ChangeLog new/dovecot-2.2-pigeonhole-0.4.20/ChangeLog
--- old/dovecot-2.2-pigeonhole-0.4.19/ChangeLog 2017-04-08 00:47:02.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/ChangeLog 2017-08-27 15:17:38.000000000 +0200
@@ -1,3 +1,198 @@
+2017-08-18 02:28:14 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (7cd71ba)
+
+ Released v0.4.20.rc1 for Dovecot v2.2.32.rc1.
+
+
+M NEWS
+M configure.ac
+
+2017-08-16 11:04:07 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (f0eff5a)
+
+ Added v0.4.18 to NEWS.
+
+
+M NEWS
+
+2016-05-02 17:09:12 +0300 Timo Sirainen <timo.sirainen(a)dovecot.fi> (d0f80d3)
+
+ testsuite: Adjusted to changes in Dovecot lib-storage API.
+
+
+M src/testsuite/testsuite-mailstore.c
+
+2017-07-08 10:51:27 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (1a93191)
+
+ sieve-tools: sieve-filter: Forgot to clean up script binary at end of
+ execution.
+
+ Normally, this would merely be an inconsequential memory leak. However, when
+ the script comes from an LDAP storage, the storage is not closed before
+ master_service_deinit() -> io_loop_destroy(). The LDAP connection's stale io
+ can cause problems while closing the main ioloop.
+
+M src/sieve-tools/sieve-filter.c
+
+2017-07-08 10:27:52 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (a7b315c)
+
+ sieve-tools: Terminate with a fatal error when script cannot be
+ compiled/opened.
+
+ Rather than continuing with binary == NULL, causing a segfault.
+
+M src/lib-sieve-tool/sieve-tool.c
+
+2017-07-06 12:34:08 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (d6598cc)
+
+ managesieve-login: managesieve_client_input_next_cmd(): Fix handling of
+ command continuation.
+
+ Commands that continued after waiting for more input always failed. This
+ mainly applies to the AUTHENTICATE command, which mostly handles its own
+ arguments. This caused problems when a string literal was used as the
+ initial response for the AUTHENTICATE command.
+
+ Caused by recent change:
+
+ Author: Timo Sirainen <timo.sirainen(a)dovecot.fi> Date: Wed Jun 14 12:39:02
+ 2017 +0300
+
+ managesieve-login: managesieve_client_input_next_cmd() - minor code cleanup
+
+M src/managesieve-login/client.c
+
+2017-07-06 12:28:44 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (159ab36)
+
+ managesieve-login: authenticate command: Make sure
+ client->auth_mech_name_parsed is reset properly upon command error.
+
+ This could cause problems for any subsequent AUTHENTICATE commmend.
+
+M src/managesieve-login/client-authenticate.c
+
+2017-06-28 18:41:33 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (af36600)
+
+ LDA Sieve plugin: Fixed memory leak caused by not cleaning up the
+ sieve_discard script.
+
+ Moved script cleanup to separate function as well.
+
+M src/plugins/lda-sieve/lda-sieve-plugin.c
+
+2017-06-13 19:36:57 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (ccb15cc)
+
+ lib-sieve: Made the retention period for redirect duplicate identifiers
+ configurable.
+
+ For accounts that perform many redirects, the lda-dupes database could grow
+ to impractical sizes. Changed the default retention period from 24 to 12
+ hours.
+
+M INSTALL
+M src/lib-sieve/cmd-redirect.c
+M src/lib-sieve/sieve-common.h
+M src/lib-sieve/sieve-config.h
+M src/lib-sieve/sieve-settings.c
+
+2017-06-22 21:12:21 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (0714b34)
+
+ lib-sieve: include extension: Fixed segfault that (sometimes) occurred when
+ the global script location was left unconfigured.
+
+
+M src/lib-sieve/plugins/include/ext-include-binary.c
+M src/lib-sieve/plugins/include/ext-include-common.c
+
+2017-06-20 23:36:10 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (62151b1)
+
+ sieve-tools: Make sure sieve command line tools properly show debug messages
+ if requested.
+
+
+M src/lib-sieve-tool/sieve-tool.c
+M src/sieve-tools/sieve-filter.c
+
+2017-06-20 20:46:28 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (39d4c9e)
+
+ lib-sieve: Clear extension context upon unload.
+
+
+M src/lib-sieve/sieve-extensions.c
+
+2017-06-16 14:42:39 +0300 Timo Sirainen <timo.sirainen(a)dovecot.fi> (c854655)
+
+ managesieve-login: Adjust to new client_vfuncs.free() API change
+
+
+M src/managesieve-login/client.c
+
+2017-06-14 12:39:46 +0300 Timo Sirainen <timo.sirainen(a)dovecot.fi> (fbe1a74)
+
+ managesieve-login: managesieve_client_input_next_cmd() - Add assert to help
+ static analyzer
+
+
+M src/managesieve-login/client.c
+
+2017-06-14 12:39:02 +0300 Timo Sirainen <timo.sirainen(a)dovecot.fi> (4434f69)
+
+ managesieve-login: managesieve_client_input_next_cmd() - minor code cleanup
+
+
+M src/managesieve-login/client.c
+
+2017-06-12 23:00:26 +0300 Timo Sirainen <timo.sirainen(a)dovecot.fi> (7ef6680)
+
+ managesieve-login: Adjust to login-common API change
+
+
+M src/managesieve-login/client.c
+
+2017-05-24 17:00:26 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (183bc5b)
+
+ Added v0.4.18 to NEWS.
+
+
+M NEWS
+
+2017-04-28 00:02:39 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (403042e)
+
+ lib-sieve: Fixed bug in handling of deferred implicit keep with implicit
+ side-effects.
+
+ Upon continuing the deferred implicit keep, the implicit side-effects (such
+ as imap flags) were not applied.
+
+M src/lib-sieve/sieve-result.c
+
+2017-04-24 18:58:07 +0300 Timo Sirainen <timo.sirainen(a)dovecot.fi> (b07b4c0)
+
+ imapsieve: Use client_add_capability() for adding the dynamic capability
+
+
+M src/plugins/imapsieve/imap-sieve-plugin.c
+
+2017-04-21 13:37:40 +0300 Timo Sirainen <timo.sirainen(a)dovecot.fi> (583db21)
+
+ managesieve-login: Fill the new client_vfuncs.send_raw_data
+
+
+M src/managesieve-login/client.c
+
+2017-04-12 13:17:53 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (3346f01)
+
+ imapsieve: Fixed flag assignment for the source message.
+
+ Implicit keep was deferred for the source message, which discards all flags.
+
+M src/plugins/imapsieve/imap-sieve.c
+
+2017-04-05 16:02:51 +0300 Timo Sirainen <timo.sirainen(a)dovecot.fi> (e506253)
+
+ managesieve-login: Fill the new banner_sent field.
+
+
+M src/managesieve-login/client.c
+
2017-04-03 20:13:50 +0200 Stephan Bosch <stephan.bosch(a)dovecot.fi> (56ce39d)
Added v0.4.17 to NEWS.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/INSTALL new/dovecot-2.2-pigeonhole-0.4.20/INSTALL
--- old/dovecot-2.2-pigeonhole-0.4.19/INSTALL 2016-10-20 23:33:52.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/INSTALL 2017-08-16 11:03:39.000000000 +0200
@@ -271,6 +271,16 @@
the envelope sender of the redirected message is also always "<>",
irrespective of what is configured for this setting.
+ sieve_redirect_duplicate_period = 12h
+ In an effort to halt potential mail loops, the Sieve redirect action records
+ identifying information for messages it has forwarded. If a duplicate message
+ is seen, it is not redirected and the message is discarded; i.e., the
+ implicit keep is canceled. This setting configures the period during which
+ the identifying information is recorded. If an account forwards many
+ messages, it may be necessary to lower this setting to prevent the
+ ~/.dovecot.lda-dupes database file (in which these are recorded) from growing
+ to an impractical size.
+
For example:
plugin {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/NEWS new/dovecot-2.2-pigeonhole-0.4.20/NEWS
--- old/dovecot-2.2-pigeonhole-0.4.19/NEWS 2017-06-26 20:54:55.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/NEWS 2017-08-27 14:41:31.000000000 +0200
@@ -1,3 +1,19 @@
+v0.4.20 27-08-2017 Stephan Bosch <stephan(a)rename-it.nl>
+
+ + Made the retention period for redirect duplicate identifiers configurable.
+ For accounts that perform many redirects, the lda-dupes database could grow
+ to impractical sizes. Changed the default retention period from 24 to 12
+ hours.
+ - sieve-filter: Fixed memory leak: forgot to clean up script binary at end of
+ execution. Normally, this would merely be an inconsequential memory leak.
+ However, when the script comes from an LDAP storage, this would cause io
+ leak warnings.
+ - managesieve-login: Fixed handling of AUTHENTICATE command. A second
+ authenticate command would be parsed wrong. This problem was caused by
+ changes in the previous release.
+ - LDA Sieve plugin: Fixed minor memory leak caused by not cleaning up the
+ sieve_discard script.
+
v0.4.19 26-06-2017 Stephan Bosch <stephan(a)rename-it.nl>
* This release adjusts Pigeonhole to several changes in the Dovecot API,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/configure new/dovecot-2.2-pigeonhole-0.4.20/configure
--- old/dovecot-2.2-pigeonhole-0.4.19/configure 2017-06-26 20:55:04.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/configure 2017-08-27 14:42:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Pigeonhole 0.4.19.
+# Generated by GNU Autoconf 2.69 for Pigeonhole 0.4.20.
#
# Report bugs to <dovecot(a)dovecot.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Pigeonhole'
PACKAGE_TARNAME='dovecot-2.2-pigeonhole'
-PACKAGE_VERSION='0.4.19'
-PACKAGE_STRING='Pigeonhole 0.4.19'
+PACKAGE_VERSION='0.4.20'
+PACKAGE_STRING='Pigeonhole 0.4.20'
PACKAGE_BUGREPORT='dovecot(a)dovecot.org'
PACKAGE_URL=''
@@ -1392,7 +1392,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Pigeonhole 0.4.19 to adapt to many kinds of systems.
+\`configure' configures Pigeonhole 0.4.20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1463,7 +1463,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Pigeonhole 0.4.19:";;
+ short | recursive ) echo "Configuration of Pigeonhole 0.4.20:";;
esac
cat <<\_ACEOF
@@ -1582,7 +1582,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Pigeonhole configure 0.4.19
+Pigeonhole configure 0.4.20
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1951,7 +1951,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Pigeonhole $as_me 0.4.19, which was
+It was created by Pigeonhole $as_me 0.4.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2841,7 +2841,7 @@
# Define the identity of the package.
PACKAGE='dovecot-2.2-pigeonhole'
- VERSION='0.4.19'
+ VERSION='0.4.20'
# Some tools Automake needs.
@@ -12875,7 +12875,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Pigeonhole $as_me 0.4.19, which was
+This file was extended by Pigeonhole $as_me 0.4.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12941,7 +12941,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Pigeonhole config.status 0.4.19
+Pigeonhole config.status 0.4.20
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/configure.ac new/dovecot-2.2-pigeonhole-0.4.20/configure.ac
--- old/dovecot-2.2-pigeonhole-0.4.19/configure.ac 2017-06-26 20:52:37.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/configure.ac 2017-08-27 14:41:11.000000000 +0200
@@ -2,7 +2,7 @@
# Be sure to update ABI version also if anything changes that might require
# recompiling plugins. Most importantly that means if any structs are changed.
-AC_INIT([Pigeonhole], [0.4.19], [dovecot(a)dovecot.org] [dovecot-2.2-pigeonhole])
+AC_INIT([Pigeonhole], [0.4.20], [dovecot(a)dovecot.org] [dovecot-2.2-pigeonhole])
AC_DEFINE_UNQUOTED([PIGEONHOLE_ABI_VERSION], "0.4.ABIv2($PACKAGE_VERSION)", [Pigeonhole ABI version])
AC_CONFIG_AUX_DIR([.])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/pigeonhole-version.h new/dovecot-2.2-pigeonhole-0.4.20/pigeonhole-version.h
--- old/dovecot-2.2-pigeonhole-0.4.19/pigeonhole-version.h 2017-06-22 21:32:24.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/pigeonhole-version.h 2017-08-27 14:42:44.000000000 +0200
@@ -1,6 +1,6 @@
#ifndef PIGEONHOLE_VERSION_H
#define PIGEONHOLE_VERSION_H
-#define PIGEONHOLE_VERSION_FULL PIGEONHOLE_VERSION" (e5c7051)"
+#define PIGEONHOLE_VERSION_FULL PIGEONHOLE_VERSION" (7cd71ba)"
#endif /* PIGEONHOLE_VERSION_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve/cmd-redirect.c new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve/cmd-redirect.c
--- old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve/cmd-redirect.c 2017-05-24 16:59:30.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve/cmd-redirect.c 2017-08-27 12:53:45.000000000 +0200
@@ -30,12 +30,6 @@
#include <stdio.h>
/*
- * Configuration
- */
-
-#define CMD_REDIRECT_DUPLICATE_KEEP (3600 * 24)
-
-/*
* Redirect command
*
* Syntax
@@ -425,6 +419,7 @@
const struct sieve_action_exec_env *aenv, void *tr_context ATTR_UNUSED,
bool *keep)
{
+ struct sieve_instance *svinst = aenv->svinst;
struct act_redirect_context *ctx =
(struct act_redirect_context *) action->context;
struct sieve_message_context *msgctx = aenv->msgctx;
@@ -504,7 +499,7 @@
/* Mark this message id as forwarded to the specified destination */
sieve_action_duplicate_mark(senv, dupeid, strlen(dupeid),
- ioloop_time + CMD_REDIRECT_DUPLICATE_KEEP);
+ ioloop_time + svinst->redirect_duplicate_period);
sieve_result_global_log(aenv, "forwarded to <%s>",
str_sanitize(ctx->to_address, 128));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve/sieve-common.h new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve/sieve-common.h
--- old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve/sieve-common.h 2017-01-23 18:18:09.000000000 +0100
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve/sieve-common.h 2017-08-16 11:03:39.000000000 +0200
@@ -203,6 +203,7 @@
unsigned int max_redirects;
const struct sieve_address *user_email;
struct sieve_address_source redirect_from;
+ unsigned int redirect_duplicate_period;
};
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve/sieve-config.h new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve/sieve-config.h
--- old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve/sieve-config.h 2017-01-23 18:18:09.000000000 +0100
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve/sieve-config.h 2017-08-16 11:03:39.000000000 +0200
@@ -14,4 +14,6 @@
#define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
+#define DEFAULT_REDIRECT_DUPLICATE_PERIOD (3600 * 12)
+
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve/sieve-settings.c new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve/sieve-settings.c
--- old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve/sieve-settings.c 2017-05-24 16:59:30.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve/sieve-settings.c 2017-08-27 12:53:45.000000000 +0200
@@ -208,6 +208,7 @@
const char *str_setting;
unsigned long long int uint_setting;
size_t size_setting;
+ sieve_number_t period;
svinst->max_script_size = SIEVE_DEFAULT_MAX_SCRIPT_SIZE;
if ( sieve_setting_get_size_value
@@ -231,6 +232,15 @@
svinst->pool, "sieve_redirect_envelope_from",
&svinst->redirect_from);
+ svinst->redirect_duplicate_period = DEFAULT_REDIRECT_DUPLICATE_PERIOD;
+ if ( sieve_setting_get_duration_value
+ (svinst, "sieve_redirect_duplicate_period", &period) ) {
+ if (period > UINT_MAX)
+ svinst->redirect_duplicate_period = UINT_MAX;
+ else
+ svinst->redirect_duplicate_period = (unsigned int)period;
+ }
+
str_setting = sieve_setting_get(svinst, "sieve_user_email");
if ( str_setting != NULL && *str_setting != '\0' ) {
svinst->user_email =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve-tool/sieve-tool.c new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve-tool/sieve-tool.c
--- old/dovecot-2.2-pigeonhole-0.4.19/src/lib-sieve-tool/sieve-tool.c 2017-06-22 21:31:51.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/lib-sieve-tool/sieve-tool.c 2017-08-27 12:53:45.000000000 +0200
@@ -536,7 +536,7 @@
if ( (sbin = sieve_compile
(svinst, filename, name, ehandler, 0, NULL)) == NULL )
- i_error("failed to compile sieve script '%s'", filename);
+ i_fatal("failed to compile sieve script '%s'", filename);
sieve_error_handler_unref(&ehandler);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/managesieve-login/client-authenticate.c new/dovecot-2.2-pigeonhole-0.4.20/src/managesieve-login/client-authenticate.c
--- old/dovecot-2.2-pigeonhole-0.4.19/src/managesieve-login/client-authenticate.c 2017-05-24 16:59:30.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/managesieve-login/client-authenticate.c 2017-08-27 12:53:45.000000000 +0200
@@ -299,8 +299,8 @@
msieve_client->skip_line = FALSE;
if ( (ret=managesieve_client_auth_read_response(msieve_client, TRUE, &error))
< 0 ) {
+ msieve_client->auth_mech_name_parsed = FALSE;
if ( error != NULL ) {
- msieve_client->auth_mech_name_parsed = FALSE;
client_send_no(client, error);
}
return 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/managesieve-login/client.c new/dovecot-2.2-pigeonhole-0.4.20/src/managesieve-login/client.c
--- old/dovecot-2.2-pigeonhole-0.4.19/src/managesieve-login/client.c 2017-06-16 15:20:29.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/managesieve-login/client.c 2017-07-13 01:03:32.000000000 +0200
@@ -301,8 +301,10 @@
if ( args[0].type != MANAGESIEVE_ARG_EOL )
ret = -1;
}
- if (ret > 0)
- ret = client->cmd->func(client, args);
+ }
+ if (ret > 0) {
+ i_assert(client->cmd != NULL);
+ ret = client->cmd->func(client, args);
}
if (ret != 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/plugins/lda-sieve/lda-sieve-plugin.c new/dovecot-2.2-pigeonhole-0.4.20/src/plugins/lda-sieve/lda-sieve-plugin.c
--- old/dovecot-2.2-pigeonhole-0.4.19/src/plugins/lda-sieve/lda-sieve-plugin.c 2017-05-24 16:59:26.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/plugins/lda-sieve/lda-sieve-plugin.c 2017-07-13 01:03:05.000000000 +0200
@@ -748,6 +748,17 @@
return ret;
}
+static void
+lda_sieve_free_scripts(struct lda_sieve_run_context *srctx)
+{
+ unsigned int i;
+
+ for ( i = 0; i < srctx->script_count; i++ )
+ sieve_script_unref(&srctx->scripts[i]);
+ if ( srctx->discard_script != NULL )
+ sieve_script_unref(&srctx->discard_script);
+}
+
static int lda_sieve_execute
(struct lda_sieve_run_context *srctx, struct mail_storage **storage_r)
{
@@ -858,7 +869,6 @@
struct lda_sieve_run_context srctx;
bool debug = mdctx->dest_user->mail_debug;
struct sieve_environment svenv;
- unsigned int i;
int ret = 0;
/* Initialize run context */
@@ -899,12 +909,10 @@
ret = -1;
else if ( srctx.scripts == NULL )
ret = 0;
- else {
+ else
ret = lda_sieve_execute(&srctx, storage_r);
-
- for ( i = 0; i < srctx.script_count; i++ )
- sieve_script_unref(&srctx.scripts[i]);
- }
+
+ lda_sieve_free_scripts(&srctx);
} T_END;
/* Clean up */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/sieve-tools/sieve-filter.c new/dovecot-2.2-pigeonhole-0.4.20/src/sieve-tools/sieve-filter.c
--- old/dovecot-2.2-pigeonhole-0.4.19/src/sieve-tools/sieve-filter.c 2017-06-22 21:31:51.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/sieve-tools/sieve-filter.c 2017-08-27 12:53:45.000000000 +0200
@@ -581,6 +581,10 @@
if ( move_box != NULL )
mailbox_free(&move_box);
+ /* Close the script binary */
+ if ( main_sbin != NULL )
+ sieve_close(&main_sbin);
+
/* Cleanup error handler */
sieve_error_handler_unref(&ehandler);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.2-pigeonhole-0.4.19/src/testsuite/testsuite-mailstore.c new/dovecot-2.2-pigeonhole-0.4.20/src/testsuite/testsuite-mailstore.c
--- old/dovecot-2.2-pigeonhole-0.4.19/src/testsuite/testsuite-mailstore.c 2017-05-24 16:59:30.000000000 +0200
+++ new/dovecot-2.2-pigeonhole-0.4.20/src/testsuite/testsuite-mailstore.c 2017-08-27 12:53:45.000000000 +0200
@@ -97,6 +97,8 @@
if (mail_storage_create(ns, "maildir", 0, &error) < 0)
i_fatal("Couldn't create testsuite storage: %s", error);
+ if (mail_namespaces_init_finish(ns, &error) < 0)
+ i_fatal("Couldn't create testsuite namespace: %s", error);
testsuite_mailstore_user = mail_user;
}
++++++ dovecot-2.2-pigeonhole-0.4.19.tar.gz -> dovecot-2.2.32.tar.gz ++++++
++++ 1064118 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package lasem for openSUSE:Factory checked in at 2017-08-29 11:44:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lasem (Old)
and /work/SRC/openSUSE:Factory/.lasem.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lasem"
Tue Aug 29 11:44:59 2017 rev:8 rq:519089 version:0.4.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/lasem/lasem.changes 2016-06-07 23:50:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lasem.new/lasem.changes 2017-08-29 11:45:10.907010133 +0200
@@ -1,0 +2,11 @@
+Sat Aug 26 16:40:40 UTC 2017 - jengelh(a)inai.de
+
+- Fix RPM group and summaries.
+
+-------------------------------------------------------------------
+Thu Aug 24 15:08:34 UTC 2017 - zaitor(a)opensuse.org
+
+- Add lasem-cairo-avoid-integer-overflow.patch cairo: Avoid integer
+ overflow (CVE-2013-7447).
+
+-------------------------------------------------------------------
New:
----
lasem-cairo-avoid-integer-overflow.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lasem.spec ++++++
--- /var/tmp/diff_new_pack.4kyVcV/_old 2017-08-29 11:45:11.834879338 +0200
+++ /var/tmp/diff_new_pack.4kyVcV/_new 2017-08-29 11:45:11.842878210 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lasem
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -20,11 +20,13 @@
Name: lasem
Version: 0.4.3
Release: 0
-Summary: Mathml and SVG rendering library
+Summary: MathML and SVG rendering library
License: LGPL-2.1+
-Group: System/Libraries
+Group: Development/Libraries/C and C++
Url: https://live.gnome.org/Lasem
Source: http://download.gnome.org/sources/%{name}/%{api}/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM lasem-cairo-avoid-integer-overflow.patch CVE-2013-7447 zaitor(a)opensuse.org -- cairo: Avoid integer overflow
+Patch0: lasem-cairo-avoid-integer-overflow.patch
BuildRequires: bison
BuildRequires: gobject-introspection >= 0.6.7
BuildRequires: intltool >= 0.35.0
@@ -38,31 +40,32 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Lasem is a library for rendering SVG and Mathml, implementing a DOM like API.
-It's based on GObject and use Pango and Cairo for the rendering. Included in the package,
-there is a simple application, lasemrender, which is able to convert a Mathml, a latex
-math or a SVG file to either a PNG, PDF or SVG image.
+Lasem is a library for rendering SVG and MathML, implementing a DOM like API.
+It's based on GObject and uses Pango and Cairo for the rendering. Included in the package
+is a simple application, lasemrender, which is able to convert a MathML, a Latex
+math or an SVG file to either PNG, PDF or an SVG image.
%package -n liblasem-0_4-4
-Summary: Mathml and SVG rendering library
+Summary: MathML and SVG rendering library
Group: System/Libraries
Recommends: %{name}-lang
%description -n liblasem-0_4-4
-Lasem is a library for rendering SVG and Mathml, implementing a DOM like API.
-It's based on GObject and use Pango and Cairo for the rendering.
+Lasem is a library for rendering SVG and MathML, implementing a DOM like API.
+It's based on GObject and uses Pango and Cairo for the rendering.
%package devel
-Summary: Mathml and SVG rendering library -- Development files
+Summary: Development files for lasem, a MathML and SVG rendering library
Group: Development/Languages/C and C++
Requires: liblasem-0_4-4 = %{version}
%description devel
-Lasem is a library for rendering SVG and Mathml, implementing a DOM like API.
-It's based on GObject and use Pango and Cairo for the rendering.
+Lasem is a library for rendering SVG and MathML, implementing a DOM like API.
+It's based on GObject and uses Pango and Cairo for the rendering.
%prep
%setup -q
+%patch0 -p1
%build
%configure \
++++++ lasem-cairo-avoid-integer-overflow.patch ++++++
>From 6f2feed780d9139a45c06e1ad399d06a4f351fbf Mon Sep 17 00:00:00 2001
From: RyuzakiKK <aasonykk(a)gmail.com>
Date: Sat, 5 Aug 2017 21:40:55 +0200
Subject: cairo: Avoid integer overflow CVE-2013-7447
lasem is affected by a possible integer overflow, that was also
found and patched upstream in gtk+
https://git.gnome.org/browse/gtk+/commit/?id=894b1ae76a32720f4bb3d39cf46040…
---
src/lsmcairo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lsmcairo.c b/src/lsmcairo.c
index c568fd5..73fb93e 100644
--- a/src/lsmcairo.c
+++ b/src/lsmcairo.c
@@ -528,7 +528,7 @@ lsm_cairo_set_source_pixbuf (cairo_t *cairo,
format = CAIRO_FORMAT_ARGB32;
cairo_stride = cairo_format_stride_for_width (format, width);
- cairo_pixels = g_malloc (height * cairo_stride);
+ cairo_pixels = g_malloc_n (height, cairo_stride);
surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
format,
width, height, cairo_stride);
--
cgit v0.12
1
0
Hello community,
here is the log from the commit of package plplot for openSUSE:Factory checked in at 2017-08-29 11:44:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plplot (Old)
and /work/SRC/openSUSE:Factory/.plplot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plplot"
Tue Aug 29 11:44:55 2017 rev:44 rq:519069 version:5.13.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2017-06-21 13:57:56.569012600 +0200
+++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2017-08-29 11:45:06.687604917 +0200
@@ -1,0 +2,22 @@
+Sat Aug 26 15:29:06 UTC 2017 - badshah400(a)gmail.com
+
+- Update to version 5.13.0:
+ * Bug fixes.
+ * The Python binding and examples now work for both Python 2 and
+ 3.
+ * Change the Fortran naming convention.
+ * Fix many "space in prefix" issues.
+ * Complete rewrite of IPC between -dev wxwidgets and wxPLViewer.
+ * Implement a new Windows GDI (wingdi) device driver.
+ * Implement new Python extension module to support pytkdemo.
+ * Fix OCaml inconsistencies for example 8.
+ * Improve the implementation of the OCaml binding.
+- Add shapelib BuildRequires for added features.
+- Rename fortran shared lib and devel package in keeping with
+ corresponding shared object naming changes.
+- Use ctest for the check section. This allows the disabling of
+ tests that either fail because of issues with the test codes
+ themselves (octave), or because of lack of a full Xserver (Qt
+ tests).
+
+-------------------------------------------------------------------
Old:
----
plplot-5.12.0.tar.gz
New:
----
plplot-5.13.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plplot.spec ++++++
--- /var/tmp/diff_new_pack.IvsDBS/_old 2017-08-29 11:45:09.083267215 +0200
+++ /var/tmp/diff_new_pack.IvsDBS/_new 2017-08-29 11:45:09.119262141 +0200
@@ -25,7 +25,7 @@
%define tk_enabled 1
%if 0%{?suse_version} != 1315 || (0%{?is_opensuse} && 0%{?sle_version}==120200)
-%define octave_enabled 0
+%define octave_enabled 1
%else
%define octave_enabled 0
%endif
@@ -33,18 +33,18 @@
%define X_display ":98"
%define ada_shlib libplplotada2
-%define c_shlib libplplot14
+%define c_shlib libplplot15
%define cxx_shlib libplplotcxx13
%define csirocsa_shlib libcsirocsa0
%define csironn_shlib libcsironn0
-%define fort_shlib libplplotf95-13
+%define fort_shlib libplplotfortran0
%define qsastime_shlib libqsastime0
%define qt_shlib libplplotqt2
%define wx_shlib libplplotwxwidgets1
# DONT SPLIT OUT plplot-tcltk-libs INTO INDIVIDUAL SHARED LIBS AS THEY ARE ALL REQUIRED TOGETHER AND THEIR SO NUMBERING CHANGE IN-STEP WITH EACH OTHER
Name: plplot
-Version: 5.12.0
+Version: 5.13.0
Release: 0
Summary: Software package for creating scientific plots
License: LGPL-2.1+
@@ -71,6 +71,7 @@
BuildRequires: python-numpy-devel
BuildRequires: python-qt5-devel
BuildRequires: qhull-devel
+BuildRequires: shapelib
BuildRequires: swig
BuildRequires: tcl-devel
BuildRequires: tk-devel
@@ -330,10 +331,10 @@
%files -n %{fort_shlib}
%defattr(-,root,root)
-%{_libdir}/libplplotf95.so.*
+%{_libdir}/libplplotfortran.so.*
##########################################################################
-%package -n %{name}f95-devel
+%package -n %{name}fortran-devel
##########################################################################
Summary: Fortran bindings for development with PLplot
Group: Development/Languages/Fortran
@@ -341,24 +342,26 @@
Requires: %{name}-common = %{version}
Requires: gcc-fortran
Requires: pkgconfig
+Obsoletes: %{name}f95-devel < 5.13.0
+Provides: %{name}f95-devel = %{version}
Obsoletes: %{name}-fortran-devel < 5.12.0
Provides: %{name}-fortran-devel = %{version}
-%description -n %{name}f95-devel
+%description -n %{name}fortran-devel
PLplot is a library of functions that are useful for making scientific
plots.
This package provides the files necessary for using PLplot in Fortran.
-%files -n %{name}f95-devel
+%files -n %{name}fortran-devel
%defattr(-,root,root)
%dir %{_libdir}/fortran
%dir %{_libdir}/fortran/modules
%{_libdir}/fortran/modules/plplot/
-%{_libdir}/libplplotf95.so
-%{_libdir}/pkgconfig/plplot-f95.pc
-%{_datadir}/plplot%{version}/examples/f95/
-%{_datadir}/plplot%{version}/examples/test_f95.sh
+%{_libdir}/libplplotfortran.so
+%{_libdir}/pkgconfig/plplot-fortran.pc
+%{_datadir}/plplot%{version}/examples/fortran/
+%{_datadir}/plplot%{version}/examples/test_fortran.sh
##########################################################################
%package java
@@ -377,7 +380,7 @@
%files java
%defattr(-,root,root)
-%{_libdir}/plplot%{version}/plplotjavac_wrap.so
+%{_libdir}/plplot%{version}/libplplotjavac_wrap.so
%{_datadir}/java/plplot.jar
%{_datadir}/plplot%{version}/examples/java/
%{_datadir}/plplot%{version}/examples/test_java.sh
@@ -425,7 +428,6 @@
%{_datadir}/octave/site/m/PLplot/
%{_libdir}/octave/site/oct/*/plplot_octave.oct
%{_datadir}/plplot%{version}/examples/octave/
-%{_datadir}/plplot%{version}/examples/Chloe.img
%{_datadir}/plplot%{version}/examples/test_octave.sh
%endif
##########################################################################
@@ -552,7 +554,7 @@
%{_datadir}/plplot%{version}/tcl/
%{_mandir}/man1/plserver.1.gz
%{_mandir}/man1/pltcl.1.gz
-%{python_sitearch}/plplot_widgetmodule.so
+
%if %{tk_enabled}
%{_bindir}/plserver
%{python_sitearch}/Plframe.py*
@@ -562,6 +564,7 @@
%{_libdir}/plplot%{version}/drivers/tk.so
%{_libdir}/plplot%{version}/drivers/tkwin.driver_info
%{_libdir}/plplot%{version}/drivers/tkwin.so
+%{python_sitearch}/*Pltk_init.*
%endif
##########################################################################
@@ -766,7 +769,7 @@
%files -n python-%{name}
%defattr(-,root,root)
-%{python_sitearch}/_plplotcmodule.so
+%{python_sitearch}/_plplotc.so
%{python_sitearch}/plplot.py*
%{python_sitearch}/plplotc.py*
%{_datadir}/plplot%{version}/examples/python/
@@ -1000,20 +1003,18 @@
%endif
#Remove a fortran static library
-rm -fr %{buildroot}%{_libdir}/libplf95*.a
+rm %{buildroot}%{_libdir}/libplfortrandemolib*.a
%fdupes %{buildroot}%{_datadir}/
-## Disable check section for now (until octave tests are fixed)
%check
pushd builddir
-# octave tests require Xserver display
-# but octave bindings are not building right now, so...
-# export DISPLAY=%%{X_display}
-# Xvfb %%{X_display} >& Xvfb.log &
-# sleep 5
-# export octaveopts=--no-window-system
-make %{?_smp_mflags} test_diff_psc
+export DISPLAY=%{X_display}
+Xvfb %{X_display} >& Xvfb.log &
+sleep 5
+# Octave tests fail, known issue with tests
+# Qt tests fail on Xvfb
+ctest -V -E "octave|qt" %{?_smp_mflags}
popd
%changelog
++++++ plplot-5.12.0.tar.gz -> plplot-5.13.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/plplot/plplot-5.12.0.tar.gz /work/SRC/openSUSE:Factory/.plplot.new/plplot-5.13.0.tar.gz differ: char 5, line 1
1
0