Hello community, here is the log from the commit of package yast2-qt-pkg for openSUSE:Factory checked in at 2012-06-29 15:22:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-qt-pkg (Old) and /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-qt-pkg", Maintainer is "TGoettlicher@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-qt-pkg/yast2-qt-pkg.changes 2012-06-25 12:47:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new/yast2-qt-pkg.changes 2012-06-29 15:22:12.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 29 10:16:38 CEST 2012 - tgoettlicher@suse.de + +- Fixed segfault in conflict dialog (bnc#765769) +- 2.21.26 + +------------------------------------------------------------------- Old: ---- yast2-qt-pkg-2.21.25.tar.bz2 New: ---- yast2-qt-pkg-2.21.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.FzCPQQ/_old 2012-06-29 15:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.FzCPQQ/_new 2012-06-29 15:22:13.000000000 +0200 @@ -18,11 +18,11 @@ Name: yast2-qt-pkg -Version: 2.21.25 +Version: 2.21.26 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-pkg-2.21.25.tar.bz2 +Source0: yast2-qt-pkg-2.21.26.tar.bz2 Group: System/YaST License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel @@ -53,7 +53,7 @@ mkdir build cd build export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$CFLAGS" +export CXXFLAGS="$CFLAGS --std=c++0x" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB=%{_lib} \ -DCMAKE_BUILD_TYPE=Release \ ++++++ yast2-qt-pkg-2.21.25.tar.bz2 -> yast2-qt-pkg-2.21.26.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.25/VERSION.cmake new/yast2-qt-pkg-2.21.26/VERSION.cmake --- old/yast2-qt-pkg-2.21.25/VERSION.cmake 2012-06-20 15:47:26.000000000 +0200 +++ new/yast2-qt-pkg-2.21.26/VERSION.cmake 2012-06-29 10:22:38.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "25") +SET(VERSION_PATCH "26") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.25/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.21.26/package/yast2-qt-pkg.changes --- old/yast2-qt-pkg-2.21.25/package/yast2-qt-pkg.changes 2012-06-20 15:47:50.000000000 +0200 +++ new/yast2-qt-pkg-2.21.26/package/yast2-qt-pkg.changes 2012-06-29 10:22:38.000000000 +0200 @@ -1,10 +1,15 @@ ------------------------------------------------------------------- +Fri Jun 29 10:16:38 CEST 2012 - tgoettlicher@suse.de + +- Fixed segfault in conflict dialog (bnc#765769) +- 2.21.26 + +------------------------------------------------------------------- Wed Jun 20 15:26:36 CEST 2012 - tgoettlicher@suse.de - Removed workaround for gcc 4.7 issues - 2.21.25 - ------------------------------------------------------------------- Fri Apr 27 10:54:25 CEST 2012 - tgoettlicher@suse.de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.25/src/YQPkgDescriptionView.cc new/yast2-qt-pkg-2.21.26/src/YQPkgDescriptionView.cc --- old/yast2-qt-pkg-2.21.25/src/YQPkgDescriptionView.cc 2012-05-10 15:10:27.000000000 +0200 +++ new/yast2-qt-pkg-2.21.26/src/YQPkgDescriptionView.cc 2012-06-29 10:22:38.000000000 +0200 @@ -55,12 +55,12 @@ #define DESKTOP_TRANSLATIONS "desktop_translations" #define DESKTOPFILEDIR "\\/share\\/applications\\/.*\\.desktop$" // RegExp #define ICONSIZE "32x32" -#define ICONPATH "/usr/share/icons/locolor/"ICONSIZE"/apps/" \ - << "/usr/share/icons/hicolor/"ICONSIZE"/apps/" \ - << "/usr/share/icons/oxygen/"ICONSIZE"/apps/" \ - << "/usr/share/icons/Tango/"ICONSIZE"/apps/" \ - << "/usr/share/icons/gnome/"ICONSIZE"/apps/" \ - << "/opt/kde3/share/icons/hicolor/"ICONSIZE"/apps/"; +#define ICONPATH "/usr/share/icons/locolor/" ICONSIZE "/apps/" \ + << "/usr/share/icons/hicolor/" ICONSIZE "/apps/" \ + << "/usr/share/icons/oxygen/" ICONSIZE "/apps/" \ + << "/usr/share/icons/Tango/" ICONSIZE "/apps/" \ + << "/usr/share/icons/gnome/" ICONSIZE "/apps/" \ + << "/opt/kde3/share/icons/hicolor/" ICONSIZE "/apps/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.25/yast2-qt-pkg.spec.in new/yast2-qt-pkg-2.21.26/yast2-qt-pkg.spec.in --- old/yast2-qt-pkg-2.21.25/yast2-qt-pkg.spec.in 2012-06-20 15:47:17.000000000 +0200 +++ new/yast2-qt-pkg-2.21.26/yast2-qt-pkg.spec.in 2012-06-29 10:22:38.000000000 +0200 @@ -32,7 +32,7 @@ mkdir build cd build export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$CFLAGS" +export CXXFLAGS="$CFLAGS --std=c++0x" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB=%{_lib} \ -DCMAKE_BUILD_TYPE=Release \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org