October 2016 - openSUSE Commits - openSUSE Mailing Lists

commit libqt5-qtwebengine for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package libqt5-qtwebengine for openSUSE:Factory checked in at 2016-10-31 11:08:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebengine (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwebengine" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebengine/libqt5-qtwebengine.changes 2016-10-06 16:46:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new/libqt5-qtwebengine.changes 2016-10-31 11:08:30.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Oct 25 13:40:49 UTC 2016 - alarrosa(a)suse.com + +- Add disable-gpu-when-using-nouveau-boo-1005323.diff. Disables the + use of the gpu by webengine when the nouveau opengl driver is + detected since nouveau doesn't support rendering from different + threads. Also, allows to use two environment variables + QT_WEBENGINE_DISABLE_GPU to force the disabling of the gpu and + QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND to disable the detection + of nouveau, just in case someone wants to try with newer nouveau + releases (boo#1005323, boo#997171). + +------------------------------------------------------------------- New: ---- disable-gpu-when-using-nouveau-boo-1005323.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebengine.spec ++++++ --- /var/tmp/diff_new_pack.Dnctp2/_old 2016-10-31 11:08:34.000000000 +0100 +++ /var/tmp/diff_new_pack.Dnctp2/_new 2016-10-31 11:08:34.000000000 +0100 @@ -41,6 +41,8 @@ Patch3: webrtc-build-with-neon.patch # PATCH-FIX-UPSTREAM Do-not-depend-on-Linux-4.5.patch Patch4: Do-not-depend-on-Linux-4.5.patch +# PATCH-FIX-UPSTREAM disable-gpu-when-using-nouveau-boo-1005323.diff -- Detect nouveau opengl drivers and disable gpu usage to work around nouveau crashing +Patch5: disable-gpu-when-using-nouveau-boo-1005323.diff # http://www.chromium.org/blink not ported to PowerPC ExcludeArch: ppc ppc64 ppc64le s390 s390x # Try to fix i586 MemoryErrors with rpmlint @@ -152,6 +154,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %package devel Summary: Qt Development Kit ++++++ disable-gpu-when-using-nouveau-boo-1005323.diff ++++++ Index: qtwebengine-opensource-src-5.7.1/src/core/web_engine_context.cpp =================================================================== --- qtwebengine-opensource-src-5.7.1.orig/src/core/web_engine_context.cpp +++ qtwebengine-opensource-src-5.7.1/src/core/web_engine_context.cpp @@ -87,6 +87,8 @@ #include <QFileInfo> #include <QGuiApplication> #include <QOpenGLContext> +#include <QOpenGLFunctions> +#include <QOffscreenSurface> #include <QStringList> #include <QVector> #include <qpa/qplatformnativeinterface.h> @@ -158,6 +160,37 @@ void dummyGetPluginCallback(const std::v } #endif +QString openGLVendor() +{ + QString vendor; + + QOpenGLContext *oldContext = QOpenGLContext::currentContext(); + QSurface *oldSurface = 0; + if (oldContext) + oldSurface = oldContext->surface(); + + QScopedPointer<QOffscreenSurface> surface( new QOffscreenSurface ); + surface->create(); + QOpenGLContext context; + if (!context.create()) { + qDebug() << "Error creating openGL context"; + } + else if (!context.makeCurrent(surface.data())) { + qDebug() << "Error making openGL context current context"; + } else { + const GLubyte *p; + QOpenGLFunctions *f = context.functions(); + if ((p = f->glGetString(GL_VENDOR))) + vendor = QString::fromLatin1(reinterpret_cast<const char *>(p)); + } + + context.doneCurrent(); + if (oldContext && oldSurface) + oldContext->makeCurrent(oldSurface); + + return vendor; +} + } // namespace namespace QtWebEngineCore { @@ -294,7 +327,20 @@ WebEngineContext::WebEngineContext() GLContextHelper::initialize(); - if (usingANGLE() || usingSoftwareDynamicGL() || usingQtQuick2DRenderer()) { + bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU"); + + if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND") && openGLVendor() == QStringLiteral("nouveau")) + { + qWarning() << "Nouveau openGL driver detected. Qt WebEngine will disable usage of the GPU.\n" + "Please consider using the propietary NVIDIA drivers.\n\n" + "Alternatively, you can set the QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND\n" + "environment variable before running this application, but this is \n" + "not recommended since this usually causes applications to crash as\n" + "Nouveau openGL drivers don't support multithreaded rendering"; + disableGpu = true; + } + + if (usingANGLE() || usingSoftwareDynamicGL() || usingQtQuick2DRenderer() || disableGpu) { parsedCommandLine->AppendSwitch(switches::kDisableGpu); } else { const char *glType = 0;

1 0

commit dbus-1-glib for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package dbus-1-glib for openSUSE:Factory checked in at 2016-10-31 11:08:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1-glib (Old) and /work/SRC/openSUSE:Factory/.dbus-1-glib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dbus-1-glib" Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1-glib/dbus-1-glib.changes 2016-10-22 13:05:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dbus-1-glib.new/dbus-1-glib.changes 2016-10-31 11:08:22.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Oct 20 09:25:32 UTC 2016 - zaitor(a)opensuse.org + +- Split out dbus-binding-tool in own sub-package. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-glib.spec ++++++ --- /var/tmp/diff_new_pack.pF4M9C/_old 2016-10-31 11:08:23.000000000 +0100 +++ /var/tmp/diff_new_pack.pF4M9C/_new 2016-10-31 11:08:23.000000000 +0100 @@ -30,6 +30,7 @@ BuildRequires: libexpat-devel BuildRequires: libselinux-devel Requires: dbus-1 +Recommends: dbus-1-glib-tool # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +39,7 @@ Group: Development/Libraries/Other Requires: dbus-1-devel Requires: dbus-1-glib = %{version} +Requires: dbus-1-glib-tool = %{version} Requires: glib2-devel %package -n dbus-1-glib-doc @@ -47,6 +49,11 @@ BuildArch: noarch %endif +%package -n dbus-1-glib-tool +Summary: Tool package for D-Bus/GLib bindings +Group: Development/Libraries/Other +Requires: dbus-1-glib = %{version} + %description D-Bus add-on library to integrate the standard D-Bus library with the GLib thread abstraction and main loop. @@ -59,6 +66,10 @@ D-Bus add-on library to integrate the standard D-Bus library with the GLib thread abstraction and main loop. +%description -n dbus-1-glib-tool +D-Bus add-on tool to integrate the standard D-Bus library with the +GLib thread abstraction and main loop. + %prep %setup -q -n dbus-glib-%{version} @@ -92,8 +103,6 @@ %files -n dbus-1-glib-devel %defattr(-, root, root) -%{_bindir}/dbus-binding-tool -%{_mandir}/man?/dbus-binding-tool.1%{ext_man} %{_includedir}/dbus-1.0/dbus/* %{_libdir}/*glib*.so %{_libdir}/pkgconfig/dbus-glib-1.pc @@ -104,4 +113,9 @@ %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/dbus-glib +%files -n dbus-1-glib-tool +%defattr(-, root, root) +%{_bindir}/dbus-binding-tool +%{_mandir}/man?/dbus-binding-tool.1%{ext_man} + %changelog

1 0

commit armadillo for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2016-10-31 09:56:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armadillo (Old) and /work/SRC/openSUSE:Factory/.armadillo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "armadillo" Changes: -------- --- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2016-09-30 15:33:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2016-10-31 09:56:50.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Oct 24 13:16:30 UTC 2016 - badshah400(a)gmail.com + +- Update to version 7.500.0: + + Expanded qz() to optionally specify ordering of the Schur + form. + + Expanded .each_slice() to support matrix multiplication. + +------------------------------------------------------------------- Old: ---- armadillo-7.400.3.tar.xz New: ---- armadillo-7.500.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.96NKpe/_old 2016-10-31 09:56:51.000000000 +0100 +++ /var/tmp/diff_new_pack.96NKpe/_new 2016-10-31 09:56:51.000000000 +0100 @@ -19,7 +19,7 @@ %define soname libarmadillo7 Name: armadillo -Version: 7.400.3 +Version: 7.500.0 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: MPL-2.0 ++++++ armadillo-7.400.3.tar.xz -> armadillo-7.500.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/CMakeLists.txt new/armadillo-7.500.0/CMakeLists.txt --- old/armadillo-7.400.3/CMakeLists.txt 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/CMakeLists.txt 2016-06-16 18:16:06.000000000 +0200 @@ -14,13 +14,9 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR) -set(ARMA_MAJOR 7) -set(ARMA_MINOR 400) -set(ARMA_PATCH 2) -set(ARMADILLO_VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}) - -message(STATUS "Configuring Armadillo ${ARMADILLO_VERSION}") - +project(armadillo CXX) +include(CheckIncludeFileCXX) +include(CheckLibraryExists) ## Set ARMA_USE_WRAPPER to false if you're getting linking errors when compiling your programs, ## or if you prefer to directly link with BLAS and/or LAPACK. @@ -40,12 +36,24 @@ set(ARMA_USE_EXTERN_CXX11_RNG false) set(ARMA_USE_SUPERLU false) # Caveat: only SuperLU version 5.x can be used! -project(armadillo CXX) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_aux/Modules/") +## extract version from sources -include(CheckIncludeFileCXX) -include(CheckLibraryExists) +set(ARMA_VERSION_FILE_NAME "${PROJECT_SOURCE_DIR}/include/armadillo_bits/arma_version.hpp") + +if(NOT EXISTS ${ARMA_VERSION_FILE_NAME}) + message(FATAL_ERROR "Can't read ${ARMA_VERSION_FILE_NAME}") +endif() + +file(READ ${ARMA_VERSION_FILE_NAME} ARMA_VERSION_FILE_CONTENTS) +string(REGEX REPLACE ".*#define ARMA_VERSION_MAJOR ([0-9]+).*" "\\1" ARMA_VERSION_MAJOR "${ARMA_VERSION_FILE_CONTENTS}") +string(REGEX REPLACE ".*#define ARMA_VERSION_MINOR ([0-9]+).*" "\\1" ARMA_VERSION_MINOR "${ARMA_VERSION_FILE_CONTENTS}") +string(REGEX REPLACE ".*#define ARMA_VERSION_PATCH ([0-9]+).*" "\\1" ARMA_VERSION_PATCH "${ARMA_VERSION_FILE_CONTENTS}") + +message(STATUS "Configuring Armadillo ${ARMA_VERSION_MAJOR}.${ARMA_VERSION_MINOR}.${ARMA_VERSION_PATCH}") + + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_aux/Modules/") if(MSVC) @@ -312,13 +320,13 @@ ## work around a silly limitation in Mac OS X if(APPLE) - if(${ARMA_MINOR} GREATER 99) - math(EXPR ARMA_MINOR_ALT "${ARMA_MINOR} / 10") + if(${ARMA_VERSION_MINOR} GREATER 99) + math(EXPR ARMA_VERSION_MINOR_ALT "${ARMA_VERSION_MINOR} / 10") else() - set(ARMA_MINOR_ALT ${ARMA_MINOR}) + set(ARMA_VERSION_MINOR_ALT ${ARMA_VERSION_MINOR}) endif() else() - set(ARMA_MINOR_ALT ${ARMA_MINOR}) + set(ARMA_VERSION_MINOR_ALT ${ARMA_VERSION_MINOR}) endif() @@ -339,7 +347,7 @@ add_library( armadillo ${PROJECT_SOURCE_DIR}/src/wrapper.cpp ) target_link_libraries( armadillo ${ARMA_LIBS} ) -set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR_ALT}.${ARMA_PATCH} SOVERSION ${ARMA_MAJOR}) +set_target_properties(armadillo PROPERTIES VERSION ${ARMA_VERSION_MAJOR}.${ARMA_VERSION_MINOR_ALT}.${ARMA_VERSION_PATCH} SOVERSION ${ARMA_VERSION_MAJOR}) ################################################################################ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/README.txt new/armadillo-7.500.0/README.txt --- old/armadillo-7.400.3/README.txt 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/README.txt 2016-06-16 18:16:06.000000000 +0200 @@ -8,33 +8,30 @@ 1: Introduction 2: Citation Details + 3: License - 3: Licenses - 4: Technical Support + 4: Requirements - 5: Requirements + 5: Linux and Mac OS X: Installation + 6: Linux and Mac OS X: Compiling & Linking - 6: Linux and Mac OS X: Installation - 7: Linux and Mac OS X: Compiling & Linking + 7: Windows: Installation + 8: Windows: Compiling & Linking - 8: Windows: Installation - 9: Windows: Compiling & Linking + 9: Support for OpenBLAS, Intel MKL and AMD ACML +10: Support for ATLAS -10: Support for OpenBLAS, Intel MKL and AMD ACML -11: Support for ATLAS +11: API Documentation +12: MEX Interface to Octave/Matlab -12: API Documentation -13: MEX Interface to Octave/Matlab - -14: Bug Reports and Frequently Asked Questions -15: Related Software +13: Bug Reports and Frequently Asked Questions +14: Related Software 1: Introduction =============== - Armadillo is a high quality C++ linear algebra library, aiming towards a good balance between speed and ease of use. @@ -55,10 +52,7 @@ The library can be used for machine learning, pattern recognition, computer vision, signal processing, bioinformatics, statistics, econometrics, etc. -Armadillo is primarily developed at Data61 / NICTA (Australia). -For information about Data61 see http://data61.csiro.au - -Main developers: +Authors: Conrad Sanderson - http://conradsanderson.id.au Ryan Curtin - http://ratml.org @@ -77,30 +71,15 @@ -3: Licenses -=========== +3: License +========== -Armadillo is available under 2 licenses: - -- Open source, under the restrictions of the Mozilla Public License (MPL) 2.0. - See the "LICENSE.txt" file for details. - -- Commercial license (not open source), available for purchase. - Please contact Conrad Sanderson for more information: - http://conradsanderson.id.au +Armadillo is available as open source, under the restrictions of the +Mozilla Public License (MPL) 2.0. See the "LICENSE.txt" file for details. -4: Technical Support -==================== - -Technical support can be obtained by purchasing the commercial license (see above). -Please contact Conrad Sanderson for more information: -http://conradsanderson.id.au - - - -5: Requirements +4: Requirements =============== Armadillo makes extensive use of template meta-programming, recursive templates @@ -122,7 +101,7 @@ -6: Linux and Mac OS X: Installation +5: Linux and Mac OS X: Installation =================================== * Step 1: @@ -195,7 +174,7 @@ -7: Linux and Mac OS X: Compiling & Linking +6: Linux and Mac OS X: Compiling & Linking ========================================== The "examples" directory contains several quick example programs @@ -219,7 +198,7 @@ -8: Windows: Installation +7: Windows: Installation ======================== The installation is comprised of 3 steps: @@ -249,7 +228,7 @@ -9: Windows: Compiling & Linking +8: Windows: Compiling & Linking =============================== Within the "examples" folder, we have included an MSVC project named "example1_win64" @@ -299,8 +278,8 @@ -10: Support for OpenBLAS, Intel MKL and AMD ACML -================================================ +9: Support for OpenBLAS, Intel MKL and AMD ACML +=============================================== Armadillo can use OpenBLAS, or Intel Math Kernel Library (MKL), or the AMD Core Math Library (ACML) as high-speed replacements @@ -357,7 +336,7 @@ -11: Support for ATLAS +10: Support for ATLAS ===================== Armadillo can use the ATLAS library for faster versions of @@ -374,7 +353,7 @@ -12: API Documentation +11: API Documentation ===================== Documentation of functions and classes is available at: @@ -386,7 +365,7 @@ -13: MEX Interface to Octave/Matlab +12: MEX Interface to Octave/Matlab ================================== The "mex_interface" folder contains examples of how to interface @@ -394,7 +373,7 @@ -14: Bug Reports and Frequently Asked Questions +13: Bug Reports and Frequently Asked Questions ============================================== Answers to frequently asked questions can be found at: @@ -416,15 +395,12 @@ -15: Related Software +14: Related Software ==================== * MLPACK: C++ library for machine learning and pattern recognition, built on top of Armadillo. http://mlpack.org -* Mantella: C++ library for analysing and solving optimisation problems - https://github.com/SebastianNiemann/Mantella - * libpca: C++ library for principal component analysis http://sourceforge.net/projects/libpca/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/docs.html new/armadillo-7.500.0/docs.html --- old/armadillo-7.400.3/docs.html 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/docs.html 2016-06-16 18:16:06.000000000 +0200 @@ -144,7 +144,7 @@  <a class="noprint" style="display:scroll; position:fixed; bottom:5px; right:5px;" href="#top">[top]</a> -<big>API Documentation for Armadillo 7.400</big> +<big>API Documentation for Armadillo 7.500</big> @@ -156,7 +156,7 @@ <table border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> -<td style="text-align: left; vertical-align: top; width: 50%;"> +<td style="text-align: left; vertical-align: top; width: 45%;"> <ul> <li> For converting Matlab/Octave programs, @@ -182,7 +182,7 @@ <td class="line" style="vertical-align: top;"> </td> -<td style="text-align: left; vertical-align: top; width: 45%;"> +<td style="text-align: left; vertical-align: top; width: 50%;"> <ul> <li> Please cite the following article if you use Armadillo in your research and/or software. @@ -195,13 +195,6 @@ Journal of Open Source Software, Vol. 1, pp. 26, 2016. </li> - </ul> </td> </tr> @@ -3867,11 +3860,11 @@ </li> <li> -Repeat a matrix operation on each slice of a cube +Repeat a matrix operation on each slice of a cube, with each slice treated as a matrix </li> <li> -Supported operations for .each_slice() and .each_slice(vector_of_indices) forms: +Supported operations for the .each_slice() form: <ul> @@ -3880,11 +3873,16 @@ <tr><td><code>-</code></td><td> </td><td>subtraction</td><td>      </td><td><code>-=</code></td><td> </td><td>in-place subtraction</td></tr> <tr><td><code>%</code></td><td> </td><td>element-wise multiplication</td><td>      </td><td><code>%=</code></td><td> </td><td>in-place element-wise multiplication</td></tr> <tr><td><code>/</code></td><td> </td><td>element-wise division</td><td>      </td><td><code>/=</code></td><td> </td><td>in-place element-wise division</td></tr> +<tr><td><code>*</code></td><td> </td><td>matrix multiplication</td><td>      </td><td><code>*=</code></td><td> </td><td>in-place matrix multiplication</td></tr> <tr><td><code>=</code></td><td> </td><td>assignment (copy)</td><td>      </td><td> </td><td> </td><td> </td></tr> </table> </ul> </li> +<li> +The .each_slice(vector_of_indices) form also supports the above operations, except for <code>*</code> and <code>*=</code> (ie. matrix multiplication) +</li> + <li>The argument vector_of_indices is optional; by default all slices are used</li> <li> @@ -7096,9 +7094,7 @@ </li> <li> -If a binary or trinary expression is given (ie. 2 or 3 terms), -the function will try to exploit the fact that the result is a 1x1 matrix -by using optimised expression evaluations +Optimised expression evaluations are automatically used when a binary or trinary expression is given (ie. 2 or 3 terms) </li> <li> @@ -7109,8 +7105,7 @@ colvec q = randu<colvec>(5); mat X = randu<mat>(5,5); -// examples of some expressions -// for which optimised implementations exist +// examples of expressions which have optimised implementations double a = as_scalar(r*q); double b = as_scalar(r*X*q); @@ -10875,12 +10870,28 @@ <div class="pagebreak"></div><div class="noprint"><hr class="greyline"> </div> <a name="qz"></a> qz( AA, BB, Q, Z, A, B ) + qz( AA, BB, Q, Z, A, B, select ) <ul> <li> Generalised Schur decomposition for pair of general square matrices A and B of the same size, such that A = Q.t()*AA*Z.t() and B = Q.t()*BB*Z.t() </li> +<li>The select argument is optional and specifies the ordering of the top left of the Schur form; it is one of the following: + +<ul> +<table> +<tbody> +<tr><td><code>"none"</code></td><td>   </td><td>no selection (default operation)</td></tr> +<tr><td><code>"lhp"</code></td><td>   </td><td>left-half-plane: eigenvalues with real part < 0</td></tr> +<tr><td><code>"rhp"</code></td><td>   </td><td>right-half-plane: eigenvalues with real part > 0</td></tr> +<tr><td><code>"iuc"</code></td><td>   </td><td>inside-unit-circle: eigenvalues with absolute value < 1</td></tr> +<tr><td><code>"ouc"</code></td><td>   </td><td>outside-unit-circle: eigenvalues with absolute value > 1</td></tr> +</tbody> +</table> +</ul> +</li> + <li>The left and right Schur vectors are stored in Q and Z, respectively</li> <li>In the complex-valued problem, the generalised eigenvalues are found in diagvec(AA) / diagvec(BB)</li> @@ -15121,6 +15132,29 @@ <tbody> <tr> <td style="vertical-align: top;"> +<code>ARMA_DONT_USE_WRAPPER</code> + </td> + <td style="vertical-align: top;"> +   + </td> + <td style="vertical-align: top;"> +Disable going through the run-time Armadillo wrapper library (libarmadillo.so) when calling LAPACK, BLAS, ARPACK, SuperLU and HDF5 functions. +You will need to directly link with BLAS, LAPACK, etc (eg. -lblas -llapack ) + </td> + </tr> + <tr> + <td style="vertical-align: top;"> +   + </td> + <td style="vertical-align: top;"> +   + </td> + <td style="vertical-align: top;"> +   + </td> + </tr> + <tr> + <td style="vertical-align: top;"> <code>ARMA_USE_LAPACK</code> </td> <td style="vertical-align: top;"> @@ -15394,29 +15428,6 @@ </tr> <tr> <td style="vertical-align: top;"> -<code>ARMA_DONT_USE_WRAPPER</code> - </td> - <td style="vertical-align: top;"> -   - </td> - <td style="vertical-align: top;"> -Disable going through the run-time Armadillo wrapper library (libarmadillo.so) when calling LAPACK, BLAS, ARPACK, SuperLU and HDF5 functions. -You will need to directly link with LAPACK, BLAS, etc (eg. -llapack -lblas) - </td> - </tr> - <tr> - <td style="vertical-align: top;"> -   - </td> - <td style="vertical-align: top;"> -   - </td> - <td style="vertical-align: top;"> -   - </td> - </tr> - <tr> - <td style="vertical-align: top;"> <a name="config_hpp_arma_use_cxx11"></a> <code>ARMA_USE_CXX11</code> </td> @@ -15891,6 +15902,14 @@ <ul> +<a name="version_7500"></a> +<li>Version 7.500: +<ul> +<li>expanded <a href="#qz">qz()</a> to optionally specify ordering of the Schur form</li> +<li>expanded <a href="#each_slice">each_slice()</a> to support matrix multiplication</li> +</ul> +</li> + <a name="version_7400"></a> <li>Version 7.400: <ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/Mat_meat.hpp new/armadillo-7.500.0/include/armadillo_bits/Mat_meat.hpp --- old/armadillo-7.400.3/include/armadillo_bits/Mat_meat.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/Mat_meat.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -3877,7 +3877,7 @@ for(uword ii=0; ii < n_cols; ++ii) { - const Col<eT> tmp(colptr(ii), n_rows, false, true); + const Col<eT> tmp(const_cast<eT*>(colptr(ii)), n_rows, false, true); F(tmp); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/arma_version.hpp new/armadillo-7.500.0/include/armadillo_bits/arma_version.hpp --- old/armadillo-7.400.3/include/armadillo_bits/arma_version.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/arma_version.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -14,9 +14,9 @@ #define ARMA_VERSION_MAJOR 7 -#define ARMA_VERSION_MINOR 400 -#define ARMA_VERSION_PATCH 3 -#define ARMA_VERSION_NAME "Feral Winter Deluxe" +#define ARMA_VERSION_MINOR 500 +#define ARMA_VERSION_PATCH 0 +#define ARMA_VERSION_NAME "Coup d'Etat" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/arrayops_meat.hpp new/armadillo-7.500.0/include/armadillo_bits/arrayops_meat.hpp --- old/armadillo-7.400.3/include/armadillo_bits/arrayops_meat.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/arrayops_meat.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -19,7 +19,7 @@ void arrayops::copy(eT* dest, const eT* src, const uword n_elem) { - if( (n_elem <= 16) && (is_cx<eT>::no) ) + if( (n_elem <= 9) && (is_cx<eT>::no) ) { arrayops::copy_small(dest, src, n_elem); } @@ -39,13 +39,6 @@ { switch(n_elem) { - case 16: dest[15] = src[15]; - case 15: dest[14] = src[14]; - case 14: dest[13] = src[13]; - case 13: dest[12] = src[12]; - case 12: dest[11] = src[11]; - case 11: dest[10] = src[10]; - case 10: dest[ 9] = src[ 9]; case 9: dest[ 8] = src[ 8]; case 8: dest[ 7] = src[ 7]; case 7: dest[ 6] = src[ 6]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/auxlib_bones.hpp new/armadillo-7.500.0/include/armadillo_bits/auxlib_bones.hpp --- old/armadillo-7.400.3/include/armadillo_bits/auxlib_bones.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/auxlib_bones.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -260,10 +260,10 @@ // QZ decomposition template<typename T, typename T1, typename T2> - inline static bool qz(Mat<T>& A, Mat<T>& B, Mat<T>& vsl, Mat<T>& vsr, const Base<T,T1>& X_expr, const Base<T,T2>& Y_expr); + inline static bool qz(Mat<T>& A, Mat<T>& B, Mat<T>& vsl, Mat<T>& vsr, const Base<T,T1>& X_expr, const Base<T,T2>& Y_expr, const char mode); template<typename T, typename T1, typename T2> - inline static bool qz(Mat< std::complex<T> >& A, Mat< std::complex<T> >& B, Mat< std::complex<T> >& vsl, Mat< std::complex<T> >& vsr, const Base< std::complex<T>, T1 >& X_expr, const Base< std::complex<T>, T2 >& Y_expr); + inline static bool qz(Mat< std::complex<T> >& A, Mat< std::complex<T> >& B, Mat< std::complex<T> >& vsl, Mat< std::complex<T> >& vsr, const Base< std::complex<T>, T1 >& X_expr, const Base< std::complex<T>, T2 >& Y_expr, const char mode); // @@ -277,4 +277,22 @@ }; + +namespace qz_helper + { + template<typename T> inline blas_int select_lhp(const T* x_ptr, const T* y_ptr, const T* z_ptr); + template<typename T> inline blas_int select_rhp(const T* x_ptr, const T* y_ptr, const T* z_ptr); + template<typename T> inline blas_int select_iuc(const T* x_ptr, const T* y_ptr, const T* z_ptr); + template<typename T> inline blas_int select_ouc(const T* x_ptr, const T* y_ptr, const T* z_ptr); + + template<typename T> inline blas_int cx_select_lhp(const std::complex<T>* x_ptr, const std::complex<T>* y_ptr); + template<typename T> inline blas_int cx_select_rhp(const std::complex<T>* x_ptr, const std::complex<T>* y_ptr); + template<typename T> inline blas_int cx_select_iuc(const std::complex<T>* x_ptr, const std::complex<T>* y_ptr); + template<typename T> inline blas_int cx_select_ouc(const std::complex<T>* x_ptr, const std::complex<T>* y_ptr); + + template<typename T> inline void_ptr ptr_cast(blas_int (*function)(const T*, const T*, const T*)); + template<typename T> inline void_ptr ptr_cast(blas_int (*function)(const std::complex<T>*, const std::complex<T>*)); + } + + //! @} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/auxlib_meat.hpp new/armadillo-7.500.0/include/armadillo_bits/auxlib_meat.hpp --- old/armadillo-7.400.3/include/armadillo_bits/auxlib_meat.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/auxlib_meat.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -3885,7 +3885,7 @@ template<typename T, typename T1, typename T2> inline bool -auxlib::qz(Mat<T>& A, Mat<T>& B, Mat<T>& vsl, Mat<T>& vsr, const Base<T,T1>& X_expr, const Base<T,T2>& Y_expr) +auxlib::qz(Mat<T>& A, Mat<T>& B, Mat<T>& vsl, Mat<T>& vsr, const Base<T,T1>& X_expr, const Base<T,T2>& Y_expr, const char mode) { arma_extra_debug_sigprint(); @@ -3921,6 +3921,11 @@ blas_int lwork = 3 * ((std::max)(blas_int(1),8*N+16)); blas_int info = 0; + if(mode == 'l') { eigsort = 'S'; selctg = qz_helper::ptr_cast(&(qz_helper::select_lhp<T>)); } + else if(mode == 'r') { eigsort = 'S'; selctg = qz_helper::ptr_cast(&(qz_helper::select_rhp<T>)); } + else if(mode == 'i') { eigsort = 'S'; selctg = qz_helper::ptr_cast(&(qz_helper::select_iuc<T>)); } + else if(mode == 'o') { eigsort = 'S'; selctg = qz_helper::ptr_cast(&(qz_helper::select_ouc<T>)); } + podarray<T> alphar(A.n_rows); podarray<T> alphai(A.n_rows); podarray<T> beta(A.n_rows); @@ -3952,6 +3957,7 @@ arma_ignore(vsr); arma_ignore(X_expr); arma_ignore(Y_expr); + arma_ignore(mode); arma_stop_logic_error("qz(): use of LAPACK must be enabled"); return false; } @@ -3966,7 +3972,7 @@ template<typename T, typename T1, typename T2> inline bool -auxlib::qz(Mat< std::complex<T> >& A, Mat< std::complex<T> >& B, Mat< std::complex<T> >& vsl, Mat< std::complex<T> >& vsr, const Base< std::complex<T>, T1 >& X_expr, const Base< std::complex<T>, T2 >& Y_expr) +auxlib::qz(Mat< std::complex<T> >& A, Mat< std::complex<T> >& B, Mat< std::complex<T> >& vsl, Mat< std::complex<T> >& vsr, const Base< std::complex<T>, T1 >& X_expr, const Base< std::complex<T>, T2 >& Y_expr, const char mode) { arma_extra_debug_sigprint(); @@ -4015,6 +4021,11 @@ blas_int lwork = 3 * ((std::max)(blas_int(1),2*N)); blas_int info = 0; + if(mode == 'l') { eigsort = 'S'; selctg = qz_helper::ptr_cast(&(qz_helper::cx_select_lhp<T>)); } + else if(mode == 'r') { eigsort = 'S'; selctg = qz_helper::ptr_cast(&(qz_helper::cx_select_rhp<T>)); } + else if(mode == 'i') { eigsort = 'S'; selctg = qz_helper::ptr_cast(&(qz_helper::cx_select_iuc<T>)); } + else if(mode == 'o') { eigsort = 'S'; selctg = qz_helper::ptr_cast(&(qz_helper::cx_select_ouc<T>)); } + podarray<eT> alpha(A.n_rows); podarray<eT> beta(A.n_rows); @@ -4046,6 +4057,7 @@ arma_ignore(vsr); arma_ignore(X_expr); arma_ignore(Y_expr); + arma_ignore(mode); arma_stop_logic_error("qz(): use of LAPACK must be enabled"); return false; } @@ -4166,4 +4178,248 @@ +// + + + +namespace qz_helper +{ + +// sgges() and dgges() require an external function with three arguments: +// select(alpha_real, alpha_imag, beta) +// where the eigenvalue is defined as complex(alpha_real, alpha_imag) / beta + +template<typename T> +inline +blas_int +select_lhp(const T* x_ptr, const T* y_ptr, const T* z_ptr) + { + arma_extra_debug_sigprint(); + + // cout << "select_lhp(): (*x_ptr) = " << (*x_ptr) << endl; + // cout << "select_lhp(): (*y_ptr) = " << (*y_ptr) << endl; + // cout << "select_lhp(): (*z_ptr) = " << (*z_ptr) << endl; + + arma_ignore(y_ptr); // ignore imaginary part + + const T x = (*x_ptr); + const T z = (*z_ptr); + + if(z == T(0)) { return blas_int(0); } // consider an infinite eig value not to lie in either lhp or rhp + + return ((x/z) < T(0)) ? blas_int(1) : blas_int(0); + } + + + +template<typename T> +inline +blas_int +select_rhp(const T* x_ptr, const T* y_ptr, const T* z_ptr) + { + arma_extra_debug_sigprint(); + + // cout << "select_rhp(): (*x_ptr) = " << (*x_ptr) << endl; + // cout << "select_rhp(): (*y_ptr) = " << (*y_ptr) << endl; + // cout << "select_rhp(): (*z_ptr) = " << (*z_ptr) << endl; + + arma_ignore(y_ptr); // ignore imaginary part + + const T x = (*x_ptr); + const T z = (*z_ptr); + + if(z == T(0)) { return blas_int(0); } // consider an infinite eig value not to lie in either lhp or rhp + + return ((x/z) > T(0)) ? blas_int(1) : blas_int(0); + } + + + +template<typename T> +inline +blas_int +select_iuc(const T* x_ptr, const T* y_ptr, const T* z_ptr) + { + arma_extra_debug_sigprint(); + + // cout << "select_iuc(): (*x_ptr) = " << (*x_ptr) << endl; + // cout << "select_iuc(): (*y_ptr) = " << (*y_ptr) << endl; + // cout << "select_iuc(): (*z_ptr) = " << (*z_ptr) << endl; + + const T x = (*x_ptr); + const T y = (*y_ptr); + const T z = (*z_ptr); + + if(z == T(0)) { return blas_int(0); } // consider an infinite eig value to be outside of the unit circle + + //return (std::abs(std::complex<T>(x,y) / z) < T(1)) ? blas_int(1) : blas_int(0); + return (std::sqrt(x*x + y*y) < std::abs(z)) ? blas_int(1) : blas_int(0); + } + + + +template<typename T> +inline +blas_int +select_ouc(const T* x_ptr, const T* y_ptr, const T* z_ptr) + { + arma_extra_debug_sigprint(); + + // cout << "select_ouc(): (*x_ptr) = " << (*x_ptr) << endl; + // cout << "select_ouc(): (*y_ptr) = " << (*y_ptr) << endl; + // cout << "select_ouc(): (*z_ptr) = " << (*z_ptr) << endl; + + const T x = (*x_ptr); + const T y = (*y_ptr); + const T z = (*z_ptr); + + if(z == T(0)) + { + return (x == T(0)) ? blas_int(0) : blas_int(1); // consider an infinite eig value to be outside of the unit circle + } + + //return (std::abs(std::complex<T>(x,y) / z) > T(1)) ? blas_int(1) : blas_int(0); + return (std::sqrt(x*x + y*y) > std::abs(z)) ? blas_int(1) : blas_int(0); + } + + + +// cgges() and zgges() require an external function with two arguments: +// select(alpha, beta) +// where the complex eigenvalue is defined as (alpha / beta) + +template<typename T> +inline +blas_int +cx_select_lhp(const std::complex<T>* x_ptr, const std::complex<T>* y_ptr) + { + arma_extra_debug_sigprint(); + + // cout << "cx_select_lhp(): (*x_ptr) = " << (*x_ptr) << endl; + // cout << "cx_select_lhp(): (*y_ptr) = " << (*y_ptr) << endl; + + const std::complex<T>& x = (*x_ptr); + const std::complex<T>& y = (*y_ptr); + + if( (y.real() == T(0)) && (y.imag() == T(0)) ) { return blas_int(0); } // consider an infinite eig value not to lie in either lhp or rhp + + return (std::real(x / y) < T(0)) ? blas_int(1) : blas_int(0); + } + + + +template<typename T> +inline +blas_int +cx_select_rhp(const std::complex<T>* x_ptr, const std::complex<T>* y_ptr) + { + arma_extra_debug_sigprint(); + + // cout << "cx_select_rhp(): (*x_ptr) = " << (*x_ptr) << endl; + // cout << "cx_select_rhp(): (*y_ptr) = " << (*y_ptr) << endl; + + const std::complex<T>& x = (*x_ptr); + const std::complex<T>& y = (*y_ptr); + + if( (y.real() == T(0)) && (y.imag() == T(0)) ) { return blas_int(0); } // consider an infinite eig value not to lie in either lhp or rhp + + return (std::real(x / y) > T(0)) ? blas_int(1) : blas_int(0); + } + + + +template<typename T> +inline +blas_int +cx_select_iuc(const std::complex<T>* x_ptr, const std::complex<T>* y_ptr) + { + arma_extra_debug_sigprint(); + + // cout << "cx_select_iuc(): (*x_ptr) = " << (*x_ptr) << endl; + // cout << "cx_select_iuc(): (*y_ptr) = " << (*y_ptr) << endl; + + const std::complex<T>& x = (*x_ptr); + const std::complex<T>& y = (*y_ptr); + + if( (y.real() == T(0)) && (y.imag() == T(0)) ) { return blas_int(0); } // consider an infinite eig value to be outside of the unit circle + + return (std::abs(x / y) < T(1)) ? blas_int(1) : blas_int(0); + } + + + +template<typename T> +inline +blas_int +cx_select_ouc(const std::complex<T>* x_ptr, const std::complex<T>* y_ptr) + { + arma_extra_debug_sigprint(); + + // cout << "cx_select_ouc(): (*x_ptr) = " << (*x_ptr) << endl; + // cout << "cx_select_ouc(): (*y_ptr) = " << (*y_ptr) << endl; + + const std::complex<T>& x = (*x_ptr); + const std::complex<T>& y = (*y_ptr); + + if( (y.real() == T(0)) && (y.imag() == T(0)) ) + { + return ((x.real() == T(0)) && (x.imag() == T(0))) ? blas_int(0) : blas_int(1); // consider an infinite eig value to be outside of the unit circle + } + + return (std::abs(x / y) > T(1)) ? blas_int(1) : blas_int(0); + } + + + +// need to do shenanigans with pointers due to: +// - we're using LAPACK ?gges() defined to expect pointer-to-function to be passed as pointer-to-object +// - explicit casting between pointer-to-function and pointer-to-object is a non-standard extension in C +// - the extension is essentially mandatory on POSIX systems +// - some compilers will complain about the extension in pedantic mode + +template<typename T> +inline +void_ptr +ptr_cast(blas_int (*function)(const T*, const T*, const T*)) + { + union converter + { + blas_int (*fn)(const T*, const T*, const T*); + void_ptr obj; + }; + + converter tmp; + + tmp.obj = 0; + tmp.fn = function; + + return tmp.obj; + } + + + +template<typename T> +inline +void_ptr +ptr_cast(blas_int (*function)(const std::complex<T>*, const std::complex<T>*)) + { + union converter + { + blas_int (*fn)(const std::complex<T>*, const std::complex<T>*); + void_ptr obj; + }; + + converter tmp; + + tmp.obj = 0; + tmp.fn = function; + + return tmp.obj; + } + + + +} // end of namespace qz_helper + + //! @} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/fn_elem.hpp new/armadillo-7.500.0/include/armadillo_bits/fn_elem.hpp --- old/armadillo-7.400.3/include/armadillo_bits/fn_elem.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/fn_elem.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -441,6 +441,12 @@ // +// +// TODO: arg (C++11) + + + +// // square template<typename T1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/fn_qz.hpp new/armadillo-7.500.0/include/armadillo_bits/fn_qz.hpp --- old/armadillo-7.400.3/include/armadillo_bits/fn_qz.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/fn_qz.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -1,4 +1,4 @@ -// Copyright (C) 2015 National ICT Australia (NICTA) +// Copyright (C) 2015-2016 National ICT Australia (NICTA) // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -30,12 +30,17 @@ Mat<typename T1::elem_type>& Q, Mat<typename T1::elem_type>& Z, const Base<typename T1::elem_type,T1>& A_expr, - const Base<typename T1::elem_type,T2>& B_expr + const Base<typename T1::elem_type,T2>& B_expr, + const char* select = "none" ) { arma_extra_debug_sigprint(); - const bool status = auxlib::qz(AA, BB, Q, Z, A_expr.get_ref(), B_expr.get_ref()); + const char sig = (select != NULL) ? select[0] : char(0); + + arma_debug_check( ( (sig != 'n') && (sig != 'l') && (sig != 'r') && (sig != 'i') && (sig != 'o') ), "qz(): unknown select form" ); + + const bool status = auxlib::qz(AA, BB, Q, Z, A_expr.get_ref(), B_expr.get_ref(), sig); if(status == false) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/operator_cube_times.hpp new/armadillo-7.500.0/include/armadillo_bits/operator_cube_times.hpp --- old/armadillo-7.400.3/include/armadillo_bits/operator_cube_times.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/operator_cube_times.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2010 National ICT Australia (NICTA) +// Copyright (C) 2008-2016 National ICT Australia (NICTA) // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -80,5 +80,37 @@ } + +template<typename eT, typename T2> +arma_inline +Cube<eT> +operator* + ( + const subview_cube_each1<eT>& X, + const Base<eT,T2>& Y + ) + { + arma_extra_debug_sigprint(); + + return subview_cube_each1_aux::operator_times(X, Y.get_ref()); + } + + + +template<typename T1, typename eT> +arma_inline +Cube<eT> +operator* + ( + const Base<eT,T1>& X, + const subview_cube_each1<eT>& Y + ) + { + arma_extra_debug_sigprint(); + + return subview_cube_each1_aux::operator_times(X.get_ref(), Y); + } + + //! @} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/subview_cube_each_bones.hpp new/armadillo-7.500.0/include/armadillo_bits/subview_cube_each_bones.hpp --- old/armadillo-7.400.3/include/armadillo_bits/subview_cube_each_bones.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/subview_cube_each_bones.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -1,4 +1,4 @@ -// Copyright (C) 2015 National ICT Australia (NICTA) +// Copyright (C) 2015-2016 National ICT Australia (NICTA) // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -56,6 +56,7 @@ template<typename T1> inline void operator-= (const Base<eT,T1>& x); template<typename T1> inline void operator%= (const Base<eT,T1>& x); template<typename T1> inline void operator/= (const Base<eT,T1>& x); + template<typename T1> inline void operator*= (const Base<eT,T1>& x); private: @@ -116,6 +117,12 @@ template<typename T1, typename eT> static inline Cube<eT> operator_div(const Base<eT,T1>& X, const subview_cube_each1<eT>& Y); + + template<typename eT, typename T2> + static inline Cube<eT> operator_times(const subview_cube_each1<eT>& X,const Base<eT,T2>& Y); + + template<typename T1, typename eT> + static inline Cube<eT> operator_times(const Base<eT,T1>& X, const subview_cube_each1<eT>& Y); }; @@ -141,6 +148,8 @@ template<typename T1, typename eT, typename TB> static inline Cube<eT> operator_div(const Base<eT,T1>& X, const subview_cube_each2<eT,TB>& Y); + + // TODO: operator_times }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/subview_cube_each_meat.hpp new/armadillo-7.500.0/include/armadillo_bits/subview_cube_each_meat.hpp --- old/armadillo-7.400.3/include/armadillo_bits/subview_cube_each_meat.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/subview_cube_each_meat.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -1,4 +1,4 @@ -// Copyright (C) 2015 National ICT Australia (NICTA) +// Copyright (C) 2015-2016 National ICT Australia (NICTA) // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -207,6 +207,21 @@ +template<typename eT> +template<typename T1> +inline +void +subview_cube_each1<eT>::operator*= (const Base<eT,T1>& in) + { + arma_extra_debug_sigprint(); + + Cube<eT>& C = access::rw(subview_cube_each_common<eT>::P); + + C = C.each_slice() * in.get_ref(); + } + + + // // // subview_cube_each2 @@ -662,6 +677,68 @@ } return out; + } + + + +template<typename eT, typename T2> +inline +Cube<eT> +subview_cube_each1_aux::operator_times + ( + const subview_cube_each1<eT>& X, + const Base<eT,T2>& Y + ) + { + arma_extra_debug_sigprint(); + + const Cube<eT>& C = X.P; + + const unwrap<T2> tmp(Y.get_ref()); + const Mat<eT>& M = tmp.M; + + Cube<eT> out(C.n_rows, M.n_cols, C.n_slices); + + for(uword i=0; i < C.n_slices; ++i) + { + Mat<eT> out_slice( out.slice_memptr(i), C.n_rows, M.n_cols, false, true); + const Mat<eT> C_slice(const_cast<eT*>(C.slice_memptr(i)), C.n_rows, C.n_cols, false, true); + + out_slice = C_slice * M; + } + + return out; + } + + + +template<typename T1, typename eT> +inline +Cube<eT> +subview_cube_each1_aux::operator_times + ( + const Base<eT,T1>& X, + const subview_cube_each1<eT>& Y + ) + { + arma_extra_debug_sigprint(); + + const unwrap<T1> tmp(X.get_ref()); + const Mat<eT>& M = tmp.M; + + const Cube<eT>& C = Y.P; + + Cube<eT> out(M.n_rows, C.n_cols, C.n_slices); + + for(uword i=0; i < C.n_slices; ++i) + { + Mat<eT> out_slice( out.slice_memptr(i), M.n_rows, C.n_cols, false, true); + const Mat<eT> C_slice(const_cast<eT*>(C.slice_memptr(i)), C.n_rows, C.n_cols, false, true); + + out_slice = M * C_slice; + } + + return out; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/include/armadillo_bits/subview_elem1_meat.hpp new/armadillo-7.500.0/include/armadillo_bits/subview_elem1_meat.hpp --- old/armadillo-7.400.3/include/armadillo_bits/subview_elem1_meat.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/include/armadillo_bits/subview_elem1_meat.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -27,6 +27,8 @@ , a(in_a) { arma_extra_debug_sigprint(); + + // TODO: refactor to unwrap 'in_a' instead of storing a ref to it; this will allow removal of carrying T1 around and repetition of size checks } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-7.400.3/mex_interface/armaMex.hpp new/armadillo-7.500.0/mex_interface/armaMex.hpp --- old/armadillo-7.400.3/mex_interface/armaMex.hpp 2016-06-16 18:16:04.000000000 +0200 +++ new/armadillo-7.500.0/mex_interface/armaMex.hpp 2016-06-16 18:16:06.000000000 +0200 @@ -362,8 +362,8 @@ return Cube<double>(); } } - - + + // Get complex cube from Matlab/Octave inline cx_cube @@ -389,8 +389,7 @@ return cx_cube(); } } - - + // return real valued cube to Matlab/Octave template<class Type> inline @@ -403,7 +402,7 @@ std::memcpy(dst_pointer, src_pointer, sizeof(Type)*armaCube.n_elem); } - + // Return double real valued cube to Matlab/Octave inline void @@ -415,7 +414,7 @@ std::memcpy(dst_pointer, src_pointer, sizeof(double)*armaCube.n_elem); } - + // Return imaginary valued cube to Matlab/Octave. template<class Type> inline @@ -428,7 +427,7 @@ std::memcpy(dst_pointer, src_pointer, sizeof(Type)*armaCube.n_elem); } - + // Return double imaginary valued matrix to Matlab/Octave inline void @@ -574,8 +573,8 @@ return SpMat<double>(locations, values, m, n, sort_locations); } } - - + + // Get imaginary sparse matrix from Matlab/Octave. template<class Type> inline @@ -694,8 +693,8 @@ return SpMat<double>(locations, values, m, n, sort_locations); } } - - + + // Return sparse matrix to matlab inline void

1 0

commit enlightenment-theme-openSUSE-ice for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package enlightenment-theme-openSUSE-ice for openSUSE:Factory checked in at 2016-10-31 09:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enlightenment-theme-openSUSE-ice (Old) and /work/SRC/openSUSE:Factory/.enlightenment-theme-openSUSE-ice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "enlightenment-theme-openSUSE-ice" Changes: -------- --- /work/SRC/openSUSE:Factory/enlightenment-theme-openSUSE-ice/enlightenment-theme-openSUSE-ice.changes 2016-09-23 11:41:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.enlightenment-theme-openSUSE-ice.new/enlightenment-theme-openSUSE-ice.changes 2016-10-31 09:56:43.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Oct 28 03:23:48 UTC 2016 - sflees(a)suse.de + +- 20161028 Fixes some minor regressions + +------------------------------------------------------------------- Old: ---- enlightenment-theme-openSUSE-ice-20160705.tar.xz New: ---- enlightenment-theme-openSUSE-ice-20161028.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enlightenment-theme-openSUSE-ice.spec ++++++ --- /var/tmp/diff_new_pack.C5JdgC/_old 2016-10-31 09:56:45.000000000 +0100 +++ /var/tmp/diff_new_pack.C5JdgC/_new 2016-10-31 09:56:45.000000000 +0100 @@ -17,7 +17,7 @@ Name: enlightenment-theme-openSUSE-ice -Version: 20160705 +Version: 20161028 Release: 0 Summary: A light openSUSE theme modified to suite the openSUSE 13.2 artwork License: BSD-2-Clause and LGPL-2.1 and CC-BY-SA-3.0 ++++++ enlightenment-theme-openSUSE-ice-20160705.tar.xz -> enlightenment-theme-openSUSE-ice-20161028.tar.xz ++++++ /work/SRC/openSUSE:Factory/enlightenment-theme-openSUSE-ice/enlightenment-theme-openSUSE-ice-20160705.tar.xz /work/SRC/openSUSE:Factory/.enlightenment-theme-openSUSE-ice.new/enlightenment-theme-openSUSE-ice-20161028.tar.xz differ: char 26, line 1

1 0

commit calligra for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2016-10-31 09:56:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calligra" Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2016-10-24 14:44:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2016-10-31 09:56:36.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Oct 26 15:51:20 UTC 2016 - wbauer(a)tmo.at + +- Disable Vc-devel-static build requirement again, it currently + makes calligra crash on runtime, and Vc 1.3.0 is entering TW + soon anyway which will break calligra's build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.bbTkhQ/_old 2016-10-31 09:56:42.000000000 +0100 +++ /var/tmp/diff_new_pack.bbTkhQ/_new 2016-10-31 09:56:42.000000000 +0100 @@ -96,7 +96,7 @@ %{kde4_pimlibs_requires} %if 0%{?suse_version} > 1320 %ifarch %ix86 x86_64 -BuildRequires: Vc-devel-static +#BuildRequires: Vc-devel-static %endif %endif %if 0%{?suse_version} > 1310

1 0

commit docker for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2016-10-31 09:56:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2016-10-26 13:29:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2016-10-31 09:56:30.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Oct 27 11:13:56 UTC 2016 - jmassaguerpla(a)suse.com + +- update docker to 1.12.3 + - fix bsc#1007249 - CVE-2016-8867: Fix ambient capability usage in containers + - other fixes: + https://github.com/docker/docker/releases/tag/v1.12.3 + +------------------------------------------------------------------- @@ -276,0 +285,5 @@ + +------------------------------------------------------------------- +Wed Apr 27 10:29:47 UTC 2016 - jmassaguerpla(a)suse.com + +- Fix go version to 1.5 (bsc#977394) Old: ---- docker-1.12.2.tar.xz New: ---- docker-1.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.Kwolph/_old 2016-10-31 09:56:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Kwolph/_new 2016-10-31 09:56:32.000000000 +0100 @@ -36,7 +36,7 @@ %global docker_migration_warnfile %{docker_store}/docker-update-message.txt %define docker_graph %{docker_store}/graph %define git_version 8eab29e -%define version_unconverted 1.12.2 +%define version_unconverted 1.12.3 %define docker_version 1.12.1 %define __arch_install_post export NO_BRP_STRIP_DEBUG=true # When upgrading to a new version requires the service not to be restarted @@ -45,7 +45,7 @@ # 1.10.1 %global last_migration_version 1.10.1 Name: docker -Version: 1.12.2 +Version: 1.12.3 Release: 0 Summary: The Linux container runtime License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Kwolph/_old 2016-10-31 09:56:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Kwolph/_new 2016-10-31 09:56:32.000000000 +0100 @@ -3,8 +3,8 @@ <param name="url">https://github.com/docker/docker.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">1.12.2</param> - <param name="revision">v1.12.2</param> + <param name="versionformat">1.12.3</param> + <param name="revision">v1.12.3</param> </service> <service name="recompress" mode="disabled"> <param name="file">docker-*.tar</param> ++++++ docker-1.12.2.tar.xz -> docker-1.12.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/docker/docker-1.12.2.tar.xz /work/SRC/openSUSE:Factory/.docker.new/docker-1.12.3.tar.xz differ: char 26, line 1

1 0

commit nagstamon for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package nagstamon for openSUSE:Factory checked in at 2016-10-31 09:56:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagstamon (Old) and /work/SRC/openSUSE:Factory/.nagstamon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nagstamon" Changes: -------- --- /work/SRC/openSUSE:Factory/nagstamon/nagstamon.changes 2016-09-16 11:00:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagstamon.new/nagstamon.changes 2016-10-31 09:56:20.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Oct 20 10:17:44 UTC 2016 - lars(a)linux-schulserver.de + +- update to 2.0.1: + Despite months of testing there were some bugs in the latest stable release, + which hopefully are gone now. This release tries to fix the following bugs: + + Major Centreon bug making it useless + + Wrong Icinga version check + + Thruk login problem + + EWMH initialization trouble + + Systrayicon left mouse click brought context menu + + DBus crashes + +------------------------------------------------------------------- +Wed Oct 19 11:09:49 UTC 2016 - lars(a)linux-schulserver.de + +- remove dependency on libqt5-qtmultimedia and build require + libqt5-qtmultimedia-devel instead + +------------------------------------------------------------------- Old: ---- Nagstamon-2.0.tar.bz2 New: ---- Nagstamon-2.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagstamon.spec ++++++ --- /var/tmp/diff_new_pack.pA7gcD/_old 2016-10-31 09:56:22.000000000 +0100 +++ /var/tmp/diff_new_pack.pA7gcD/_new 2016-10-31 09:56:22.000000000 +0100 @@ -18,7 +18,7 @@ Name: nagstamon -Version: 2.0 +Version: 2.0.1 Release: 0 Summary: Nagios status monitor for the desktop License: GPL-2.0 @@ -40,18 +40,22 @@ Requires: python3-psutil Requires: python3-qt5 Requires: python3-requests -Requires: qt5-qtmultimedia Requires: qt5-qtsvg %endif # # openSUSE dependencies # %if 0%{?suse_version} +BuildRequires: libqt5-qtmultimedia-devel +BuildRequires: python-SecretStorage +BuildRequires: python3-beautifulsoup4 +BuildRequires: python3-psutil +BuildRequires: python3-pycrypto BuildRequires: python3-qt5 +BuildRequires: python3-qt5 +BuildRequires: python3-requests BuildRequires: python3-setuptools BuildRequires: update-desktop-files -Requires: libqt5-qtmultimedia -Requires: libqt5-qtsvg Requires: python-SecretStorage Requires: python3-beautifulsoup4 Requires: python3-psutil @@ -74,7 +78,7 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %description Nagstamon is a Nagios status monitor which takes place in systray or on desktop @@ -97,13 +101,17 @@ --single-version-externally-managed \ -O1 \ --root=%{buildroot} \ - --install-lib=%{python_sitelib} \ + --install-lib=%{python3_sitelib} \ --prefix=%{_prefix} mv %{buildroot}/%{_bindir}/nagstamon.py %{buildroot}/%{_bindir}/nagstamon +if [ -d %buildroot/Nagstamon ]; then + mkdir -p %{buildroot}/%{python3_sitelib} + my Nagstamon %{buildroot}/%{python3_sitelib}/ +fi # desktop stuff chmod -x %{buildroot}%{_datadir}/pixmaps/nagstamon.svg -chmod -x %{buildroot}%{python_sitelib}/Nagstamon/resources/*.svg -for file in $(grep -wlr bin/env %{buildroot}%{python_sitelib}/Nagstamon/*); do +chmod -x %{buildroot}%{python3_sitelib}/Nagstamon/resources/*.svg +for file in $(grep -wlr bin/env %{buildroot}%{python3_sitelib}/Nagstamon/*); do chmod +x $file done # openSUSE @@ -138,9 +146,9 @@ %doc ChangeLog COPYRIGHT LICENSE %{_datadir}/pixmaps/nagstamon* %{_datadir}/applications/*nagstamon.desktop -%{python_sitelib}/Nagstamon/ +%{python3_sitelib}/Nagstamon/ %{_bindir}/nagstamon %{_mandir}/man1/nagstamon.1* -%{python_sitelib}/%{name}*.egg-info +%{python3_sitelib}/%{name}*.egg-info %changelog ++++++ Nagstamon-2.0.tar.bz2 -> Nagstamon-2.0.1.tar.bz2 ++++++ ++++ 3035 lines of diff (skipped)

1 0

commit mysql-community-server for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at 2016-10-31 09:56:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old) and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mysql-community-server" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes 2016-04-30 23:31:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes 2016-10-31 09:56:16.000000000 +0100 @@ -1,0 +2,46 @@ +Mon Oct 24 19:08:22 UTC 2016 - kstreitova(a)suse.com + +- update to 5.6.34 + * changes + http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-34.html + http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-33.html + http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-32.html + http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-31.html + * fixed CVEs: + CVE-2016-6304, CVE-2016-6662, CVE-2016-7440, CVE-2016-5584, + CVE-2016-5617, CVE-2016-5616, CVE-2016-5626, CVE-2016-3492, + CVE-2016-5629, CVE-2016-5507, CVE-2016-8283, CVE-2016-5609, + CVE-2016-5612, CVE-2016-5627, CVE-2016-5630, CVE-2016-8284, + CVE-2016-8288, CVE-2016-3477, CVE-2016-2105, CVE-2016-3486, + CVE-2016-3501, CVE-2016-3521, CVE-2016-3615, CVE-2016-3614, + CVE-2016-3459, CVE-2016-5439, CVE-2016-5440 + * fix + [bsc#999666], [bsc#998309], [bsc#1005581], [bsc#1005558], + [bsc#1005563], [bsc#1005562], [bsc#1005566], [bsc#1005555], + [bsc#1005569], [bsc#1005557], [bsc#1005582], [bsc#1005560], + [bsc#1005561], [bsc#1005567], [bsc#1005570], [bsc#1005583], + [bsc#1005586], [bsc#989913], [bsc#977614], [bsc#989914], + [bsc#989915], [bsc#989919], [bsc#989922], [bsc#989921], + [bsc#989911], [bsc#989925], [bsc#989926] + * refresh mysql-community-server-5.6.10-group.patch +- requires devel packages for aio and lzo2 +- append "--ignore-db-dir=lost+found" to the mysqld options in + "mysql-systemd-helper" script if "lost+found" directory is found + in $datadir [bnc#986251] +- remove syslog.target from *.service files [bsc#983938] +- add BuildRequires: systemd-devel +- make some dependecies switchable +- add systemd to deps to build on leap and friends +- replace '%{_libexecdir}/systemd/system' with %{_unitdir} macro +- remove useless mysql(a)default.service [bsc#971456] +- replace all occurrences of the string "@sysconfdir@" with "/etc" in + mysql-community-server-5.6.3-logrotate.patch as it wasn't expanded + properly [bsc#990890] +- remove '%define _rundir' as 13.1 is out of support scope +- run 'usermod -g mysql mysql' only if mysql user is not in mysql group. + Run 'usermod -s /bin/false/ mysql' only if mysql user doesn't have + '/bin/false' shell set. +- re-enable mysql profiling +- fix constraints conditions for 32bit architectures + +------------------------------------------------------------------- Old: ---- mysql-5.6.30.tar.gz New: ---- mysql-5.6.34.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.EVIJN7/_old 2016-10-31 09:56:20.000000000 +0100 +++ /var/tmp/diff_new_pack.EVIJN7/_new 2016-10-31 09:56:20.000000000 +0100 @@ -26,14 +26,11 @@ %define preferred 0 %define builtin_plugins partition,csv,heap,myisam,innobase %define extra_provides mysql-community-server_56 -%define with_mandatory_boost 0 +%define with_mandatory_lz4 0 +%define build_readline 0 %define build_extras 0 # _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2 %{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d } -# Remove when 13.1 is out of support scope -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run -%endif %if 0%{build_extras} > 0 %define with_jemalloc 1 #temporarily disable OQGraph (see MDEV-9479) @@ -46,7 +43,7 @@ %define with_cassandra 0 %endif Name: mysql-community-server -Version: 5.6.30 +Version: 5.6.34 Release: 0 Summary: Server part of %{pretty_name} License: SUSE-GPL-2.0-with-FLOSS-exception @@ -102,7 +99,10 @@ BuildRequires: tcpd-devel BuildRequires: time BuildRequires: zlib-devel -BuildRequires: pkgconfig(systemd) +# pkgconfig(systemd) on most versions is in systemd main pkg, remove +# after oldest supported is Leap 43 +BuildRequires: systemd +BuildRequires: systemd-devel # required by rcmysql Requires: %{name}-client Requires: %{name}-errormessages = %{version} @@ -129,19 +129,21 @@ Obsoletes: %{extra_provides}-debug-version < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} +%if 0%{with_mandatory_lz4} > 0 +# Dependency introduced in 5.7 mysql +BuildRequires: liblz4-devel +%endif # On mariadb we want readline5 (except for SLE12) and on mysql we use libedit from system -%if ("%{name}" == "mariadb" ) && ! (( 0%{?suse_version} == 1315 ) && ( ! 0%{?is_opensuse} )) +%if 0%{build_readline} > 0 && ! (( 0%{?suse_version} == 1315 ) && ( ! 0%{?is_opensuse} )) BuildRequires: readline5-devel %else BuildRequires: libedit-devel %endif -%if 0%{with_mandatory_boost} > 0 -BuildRequires: boost-devel >= 1.57.0 -%endif %if 0%{with_oqgraph} > 0 || 0%{with_cassandra} > 0 BuildRequires: boost-devel %endif -%if 0%{with_jemalloc} > 0 +# Build with jemalloc even for mariadb-100 to enable TokuDB there (bnc#970287) +%if 0%{with_jemalloc} > 0 || "%{extra_provides}" == "mariadb_100" BuildRequires: jemalloc-devel %endif %if 0%{with_oqgraph} > 0 @@ -184,8 +186,10 @@ Summary: %{pretty_name} development header files and libraries Group: Development/Libraries/C and C++ Requires: glibc-devel +Requires: libaio-devel Requires: libmysqlclient%{soname} = %{version} Requires: libmysqlclient_r%{soname} = %{version} +Requires: lzo-devel Requires: zlib-devel Requires: pkgconfig(libssl) # mysql-devel needs to be provided as some pkgs still depend on it @@ -359,6 +363,7 @@ sed -i 's|mysqlclient|%{libname}|g' $i sed -i 's|-lib%{libname}-symbols.patch|-libmysqlclient-symbols.patch|g' $i done +mv scripts/mysqlclient.pc.in scripts/%{libname}.pc.in || continue %endif # Broken test that needs sources rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result @@ -376,7 +381,7 @@ %cmake -DWITH_SSL=system \ -DWITH_ASAN=OFF \ -DWITH_LIBWRAP=ON \ - -DENABLED_PROFILING=OFF \ + -DENABLED_PROFILING=ON \ -DENABLE_DEBUG_SYNC=OFF \ -DWITH_PIC=ON \ -DWITH_ZLIB=system \ @@ -386,10 +391,12 @@ -DWITH_LIBEDIT=0 \ -DWITH_EDITLINE=system \ -DINSTALL_LAYOUT=RPM \ + -DWITH_SYSTEMD=ON \ + -DWITH_LZ4=system \ -DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock" \ -DINSTALL_UNIX_ADDRDIR="%{_localstatedir}/run/mysql/mysql.sock" \ -DINSTALL_MYSQLSHAREDIR=share/%{name} \ - -DWITH_COMMENT="openSUSE MySQL rpm" \ + -DWITH_COMMENT="openSUSE mysql-community-server rpm" \ -DWITH_EXTRA_CHARSET=all \ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ @@ -403,9 +410,11 @@ -DWITH_XTRADB_STORAGE_ENGINE=1 \ -DWITH_CSV_STORAGE_ENGINE=1 \ -DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \ + -DWITH_INNODB_MEMCACHED=ON \ -DWITH_EMBEDDED_SERVER=true \ -DWITH_WSREP=ON \ -DWITH_INNODB_DISALLOW_WRITES=1 \ + -DWITH_BOOST=../boost/ \ -DCOMPILATION_COMMENT="openSUSE package" \ -DDENABLE_DOWNLOADS=false \ -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \ @@ -469,9 +478,6 @@ install -p -m 644 build/Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/ install -p -m 644 build/Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/ -# Remove handler socket client -rm -f %{buildroot}%{_libdir}/mysql/plugin/handlersocket.so - # Remove debug management for keys Mariadb 101+ rm -f %{buildroot}%{_libdir}/mysql/plugin/debug_key_management.so @@ -491,9 +497,9 @@ # Remove unused services for mariadb_101 %if "%{extra_provides}" == "mariadb_101" -rm -f %{buildroot}'%{_libexecdir}/systemd/system/mariadb.service' -rm -f %{buildroot}'%{_libexecdir}/systemd/system/mariadb@.service' -rm -f %{buildroot}'%{_libexecdir}/systemd/system/mariadb(a)bootstrap.service.d/use_galera_new_cluster.conf' +rm -f %{buildroot}'%{_unitdir}/mariadb.service' +rm -f %{buildroot}'%{_unitdir}/mariadb@.service' +rm -f %{buildroot}'%{_unitdir}/mariadb(a)bootstrap.service.d/use_galera_new_cluster.conf' %endif # Generate various filelists @@ -563,10 +569,9 @@ install -D -m 755 %{_sourcedir}/mysql-systemd-helper '%{buildroot}'%{_libexecdir}/mysql/mysql-systemd-helper sed -i 's|@MYSQLVER@|%{version}|' '%{buildroot}'%{_libexecdir}/mysql/mysql-systemd-helper ln -sf service '%{buildroot}'%{_sbindir}/rcmysql -install -D -m 644 %{_sourcedir}/mysql.service '%{buildroot}'%{_libexecdir}/systemd/system/mysql.service -install -D -m 644 %{_sourcedir}/mysql@.service '%{buildroot}'%{_libexecdir}/systemd/system/mysql@.service -install -D -m 644 %{_sourcedir}/mysql.target '%{buildroot}'%{_libexecdir}/systemd/system/mysql.target -ln -s mysql@.service '%{buildroot}'%{_libexecdir}/systemd/system/mysql(a)default.service +install -D -m 644 %{_sourcedir}/mysql.service '%{buildroot}'%{_unitdir}/mysql.service +install -D -m 644 %{_sourcedir}/mysql@.service '%{buildroot}'%{_unitdir}/mysql@.service +install -D -m 644 %{_sourcedir}/mysql.target '%{buildroot}'%{_unitdir}/mysql.target rm -rf '%{buildroot}'%{_sysconfdir}/init.d # Tmpfiles file to exclude mysql tempfiles that are auto-cleaned up @@ -660,19 +665,23 @@ getent group mysql >/dev/null || groupadd -r mysql getent passwd mysql >/dev/null || useradd -r -o -g mysql -u 60 -c "MySQL database admin" \ -s /bin/false -d %{_localstatedir}/lib/mysql mysql -usermod -g mysql -s /bin/false mysql +# if mysql user is not in mysql group or if mysql user doesn't have '/bin/false' shell set, do so +id -Gn mysql | grep '\bmysql\b' &>/dev/null || usermod -g mysql mysql +getent passwd mysql | cut -d: -f7 | grep '\b/bin/false\b' &>/dev/null || usermod -s /bin/false mysql exit 0 %pre getent group mysql >/dev/null || groupadd -r mysql getent passwd mysql >/dev/null || useradd -r -o -g mysql -u 60 -c "MySQL database admin" \ -s /bin/false -d %{_localstatedir}/lib/mysql mysql -usermod -g mysql -s /bin/false mysql +# if mysql user is not in mysql group or if mysql user doesn't have '/bin/false' shell set, do so +id -Gn mysql | grep '\bmysql\b' &>/dev/null || usermod -g mysql mysql +getent passwd mysql | cut -d: -f7 | grep '\b/bin/false\b' &>/dev/null || usermod -s /bin/false mysql -%service_add_pre mysql.service mysql@.service mysql.target mysql(a)default.service +%service_add_pre mysql.service %post -%service_add_post mysql.service mysql@.service mysql.target mysql(a)default.service +%service_add_post mysql.service # Use %%tmpfiles_create when 13.2 is oldest in support scope %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || : @@ -731,10 +740,10 @@ exit 0 %preun -%service_del_preun mysql.service mysql@.service mysql.target mysql(a)default.service +%service_del_preun mysql.service %postun -%service_del_postun mysql.service mysql@.service mysql.target mysql(a)default.service +%service_del_postun mysql.service # Remove the /var/adm updatemsg that was hand-created and thus not on filelist rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} @@ -762,10 +771,9 @@ %dir %{_libexecdir}/mysql %dir %attr(0700, mysql, mysql) %{_localstatedir}/log/mysql %{_libexecdir}/mysql/mysql-systemd-helper -%{_libexecdir}/systemd/system/mysql.service -%{_libexecdir}/systemd/system/mysql@.service -%{_libexecdir}/systemd/system/mysql(a)default.service -%{_libexecdir}/systemd/system/mysql.target +%{_unitdir}/mysql.service +%{_unitdir}/mysql@.service +%{_unitdir}/mysql.target %{_tmpfilesdir}/mysql.conf %{_sbindir}/rcmysql %dir %{_datadir}/%{name} @@ -784,6 +792,7 @@ # Pack files for mariadb_101 %if "%{extra_provides}" == "mariadb_101" %{_bindir}/galera_new_cluster +%{_bindir}/galera_recovery %{_bindir}/mariadb-service-convert %dir %{_datadir}/mysql/policy %dir %{_datadir}/mysql/policy/apparmor ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.EVIJN7/_old 2016-10-31 09:56:20.000000000 +0100 +++ /var/tmp/diff_new_pack.EVIJN7/_new 2016-10-31 09:56:20.000000000 +0100 @@ -1,11 +1,23 @@ <constraints> - <hardware> - <physicalmemory> - <size unit="M">5000</size> - </physicalmemory> - <disk> - <size unit="G">13</size> - </disk> - </hardware> -</constraints> + <overwrite> + <conditions> + <arch>i586</arch> + <arch>x86_64</arch> + <arch>ppc64le</arch> + </conditions> + <hardware> + <physicalmemory> + <size unit="M">5000</size> + </physicalmemory> + </hardware> + </overwrite> + <overwrite> + <conditions/> + <hardware> + <disk> + <size unit="G">13</size> + </disk> + </hardware> + </overwrite> +</constraints> ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ mysql-5.6.30.tar.gz -> mysql-5.6.34.tar.gz ++++++ /work/SRC/openSUSE:Factory/mysql-community-server/mysql-5.6.30.tar.gz /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-5.6.34.tar.gz differ: char 5, line 1 ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.6.10-group.patch new/mysql-patches/mysql-patches/mysql-community-server-5.6.10-group.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.6.10-group.patch 2015-06-16 13:03:35.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.6.10-group.patch 2016-09-26 18:44:21.000000000 +0200 @@ -25,14 +25,14 @@ # these might have been set in a [mysqld_safe] section of my.cnf # they are added to mysqld command line to override settings from my.cnf -@@ -592,11 +594,17 @@ then +@@ -597,11 +599,17 @@ then if test "$user" != "root" -o $SET_USER = 1 then USER_OPTION="--user=$user" + GROUP_OPTION="--group=$group" fi # Change the err log to the right user, if it is in use - if [ $want_syslog -eq 0 ]; then + if [ $want_syslog -eq 0 -a ! -h "$err_log" ]; then touch "$err_log" - chown $user "$err_log" + if [ "$user" -a "$group" ]; then @@ -44,20 +44,20 @@ fi if test -n "$open_files" then -@@ -615,7 +623,12 @@ mysql_unix_port_dir=`dirname $safe_mysql - if [ ! -d $mysql_unix_port_dir ] +@@ -621,7 +629,12 @@ if [ ! -d $mysql_unix_port_dir ] then - mkdir $mysql_unix_port_dir -- chown $user $mysql_unix_port_dir -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $mysql_unix_port_dir -+ else -+ [ "$user" ] && chown $user $mysql_unix_port_dir -+ [ "$group" ] && chgrp $group $mysql_unix_port_dir -+ fi - chmod 755 $mysql_unix_port_dir + if [ ! -h $mysql_unix_port_dir ]; then + mkdir $mysql_unix_port_dir +- chown $user $mysql_unix_port_dir ++ if [ "$user" -a "$group" ]; then ++ chown $user:$group $mysql_unix_port_dir ++ else ++ [ "$user" ] && chown $user $mysql_unix_port_dir ++ [ "$group" ] && chgrp $group $mysql_unix_port_dir ++ fi + chmod 755 $mysql_unix_port_dir + fi fi - Index: scripts/mysql_install_db.sh =================================================================== --- scripts/mysql_install_db.sh.orig @@ -126,7 +126,7 @@ =================================================================== --- scripts/CMakeLists.txt.orig +++ scripts/CMakeLists.txt -@@ -138,6 +138,7 @@ ENDIF() +@@ -161,6 +161,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.6.3-logrotate.patch new/mysql-patches/mysql-patches/mysql-community-server-5.6.3-logrotate.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.6.3-logrotate.patch 2015-06-16 13:03:35.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.6.3-logrotate.patch 2016-10-17 19:42:19.000000000 +0200 @@ -25,9 +25,9 @@ + ret=$? + if test $ret -ne 0 + then -+ echo "@sysconfdir@/logrotate.d/mysql failed, probably because" >&2 ++ echo "/etc/logrotate.d/mysql failed, probably because" >&2 + echo "the root acount is protected by password." >&2 -+ echo "See comments in @sysconfdir@/logrotate.d/mysql on how to fix this" >&2 ++ echo "See comments in /etc/logrotate.d/mysql on how to fix this" >&2 + exit $ret + fi fi ++++++ mysql-systemd-helper ++++++ --- /var/tmp/diff_new_pack.EVIJN7/_old 2016-10-31 09:56:20.000000000 +0100 +++ /var/tmp/diff_new_pack.EVIJN7/_new 2016-10-31 09:56:20.000000000 +0100 @@ -10,7 +10,7 @@ MYSQLVER="$(echo @MYSQLVER@ | sed 's|\.[0-9]\+$||')" mysql_daemon_user=mysql mysql_daemon_group=mysql - if [[ -z "$INSTANCE" || "x$INSTANCE" = "xdefault" ]]; then + if [[ -z "$INSTANCE" ]]; then datadir=/var/lib/mysql socket="/var/run/mysql/mysql.sock" else @@ -19,7 +19,7 @@ fi # Read options - important for multi setup - if [[ -n "$INSTANCE" && "x$INSTANCE" != "xdefault" ]]; then + if [[ -n "$INSTANCE" ]]; then opts="$(/usr/bin/my_print_defaults mysqld mysqld_multi "$INSTANCE")" tmp_opts="$opts" config="/etc/my${INSTANCE}.cnf" @@ -38,6 +38,14 @@ --user=*) mysql_daemon_user="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;; esac done + + # work-around for lost+found directory in $datadir (bug #986251) + if [ -d "$datadir/lost+found" ] + then + ignore_db_dir="--ignore-db-dir=lost+found" + else + ignore_db_dir="" + fi } # Create new empty database if needed @@ -93,6 +101,7 @@ --user="$mysql_daemon_user" \ --skip-networking \ --skip-grant-tables \ + $ignore_db_dir \ --log-error="$protected/log_upgrade_run" \ --socket="$protected/mysql.sock" \ --pid-file="$protected/mysqld.pid" & @@ -151,6 +160,7 @@ mysql_start() { exec /usr/sbin/mysqld \ --defaults-file="$config" \ + $ignore_db_dir \ --user="$mysql_daemon_user" } ++++++ mysql.service ++++++ --- /var/tmp/diff_new_pack.EVIJN7/_old 2016-10-31 09:56:20.000000000 +0100 +++ /var/tmp/diff_new_pack.EVIJN7/_new 2016-10-31 09:56:20.000000000 +0100 @@ -1,16 +1,16 @@ [Unit] Description=MySQL server Wants=basic.target -Conflicts=mysql.target mysql(a)default.service -After=basic.target network.target syslog.target +Conflicts=mysql.target +After=basic.target network.target [Service] Restart=on-failure Type=simple -ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install default -ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade default -ExecStart=/usr/lib/mysql/mysql-systemd-helper start default -ExecStartPost=/usr/lib/mysql/mysql-systemd-helper wait default +ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install +ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade +ExecStart=/usr/lib/mysql/mysql-systemd-helper start +ExecStartPost=/usr/lib/mysql/mysql-systemd-helper wait [Install] WantedBy=multi-user.target ++++++ mysql@.service ++++++ --- /var/tmp/diff_new_pack.EVIJN7/_old 2016-10-31 09:56:20.000000000 +0100 +++ /var/tmp/diff_new_pack.EVIJN7/_new 2016-10-31 09:56:20.000000000 +0100 @@ -2,7 +2,7 @@ Description=MySQL server - %I instance Wants=basic.target PartOf=mysql.target -After=basic.target network.target syslog.target +After=basic.target network.target [Service] Restart=on-failure

1 0

commit virt-viewer for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at 2016-10-31 09:56:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old) and /work/SRC/openSUSE:Factory/.virt-viewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-viewer" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2016-09-07 11:46:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-viewer.new/virt-viewer.changes 2016-10-31 09:56:09.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Oct 13 00:41:04 CEST 2016 - ro(a)suse.de + +- remove exclusivearch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.fr49bf/_old 2016-10-31 09:56:10.000000000 +0100 +++ /var/tmp/diff_new_pack.fr49bf/_new 2016-10-31 09:56:10.000000000 +0100 @@ -37,7 +37,6 @@ Patch51: virtview-desktop.patch Patch52: reverse-3d5627d7-for-xen.patch Patch53: virtview-dont-show-Domain-0.patch -ExclusiveArch: %ix86 x86_64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake

1 0

commit gstreamer-transcoder for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '16

31 Oct '16

Hello community, here is the log from the commit of package gstreamer-transcoder for openSUSE:Factory checked in at 2016-10-31 09:56:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-transcoder (Old) and /work/SRC/openSUSE:Factory/.gstreamer-transcoder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-transcoder" Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-transcoder/gstreamer-transcoder.changes 2016-10-18 10:39:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gstreamer-transcoder.new/gstreamer-transcoder.changes 2016-10-31 09:56:01.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Oct 22 22:18:36 UTC 2016 - jengelh(a)inai.de + +- Update descriptions + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-transcoder.spec ++++++ --- /var/tmp/diff_new_pack.zMN4Ls/_old 2016-10-31 09:56:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zMN4Ls/_new 2016-10-31 09:56:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gst-transcoder +# spec file for package gstreamer-transcoder # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -29,35 +29,36 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GStreamer Transcoding API %package -n libgsttranscoder-1_0-0 -Summary: GST Transcoder API +Summary: GStreamer Transcoder API Group: System/Libraries %description -n libgsttranscoder-1_0-0 -GST Transcoding API - Shared library +This subpackage contains the implementation of the GStreamer API. %package -n typelib-1_0-GstTranscoder-1_0 -Summary: GST Transcoder API -- Introspection bindings +Summary: Introspection bindings for the GStreamer Transcoder API Group: System/Libraries %description -n typelib-1_0-GstTranscoder-1_0 -GST Transcoding API - Introspection bindings +This subpackage contains the introspection bindings for the GStreamer Transcoding API. %package devel +Summary: Development files for the GStreamer Transcoding API Group: Development/Languages/C and C++ -Summary: GStreamer Transcoding API - Development files Requires: libgsttranscoder-1_0-0 = %{version} Requires: typelib-1_0-GstTranscoder-1_0 = %{version} %description devel -GStreamer Transcoding API - Development files +This subpackage contains the header files needed to build applications +making use of the GStreamer Transcoding API. %prep %setup -q -n %{_name}-%{version}

1 0