Hello community, here is the log from the commit of package yast2-qt-pkg for openSUSE:Factory checked in at 2012-05-08 18:02:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-23 15:12:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new/yast2-qt-pkg.changes 2012-05-08 18:02:33.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Apr 27 10:54:25 CEST 2012 - tgoettlicher@suse.de + +- Workaround for gcc 4.7 issues +- 2.21.24 + +------------------------------------------------------------------- +Thu Apr 26 11:03:07 CEST 2012 - tgoettlicher@suse.de + +- Added package group for unneeded packages +- 2.21.23 + +------------------------------------------------------------------- Old: ---- yast2-qt-pkg-2.21.22.tar.bz2 New: ---- yast2-qt-pkg-2.21.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.fB0mTI/_old 2012-05-08 18:02:34.000000000 +0200 +++ /var/tmp/diff_new_pack.fB0mTI/_new 2012-05-08 18:02:34.000000000 +0200 @@ -18,11 +18,11 @@ Name: yast2-qt-pkg -Version: 2.21.22 +Version: 2.21.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-pkg-2.21.22.tar.bz2 +Source0: yast2-qt-pkg-2.21.24.tar.bz2 Group: System/YaST License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel @@ -33,9 +33,15 @@ Requires: yast2-qt >= 2.20.0 %requires_ge libqt4 BuildRequires: yast2-qt-devel >= 2.20.0 -BuildRequires: libzypp-devel >= 7.4.0 +BuildRequires: libzypp-devel >= 11.4.0 BuildRequires: yast2-libyui-devel >= 2.20.0 -Requires: libzypp >= 7.4.0 +%if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif +Requires: libzypp >= 11.4.0 Requires: yast2-libyui >= 2.20.0 Requires: yast2_theme >= 2.16.1 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 @@ -52,6 +58,10 @@ %build mkdir build cd build +%if 0%{?force_gcc_46} +export CC=gcc-4.6 +export CXX=g++-4.6 +%endif export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ ++++++ yast2-qt-pkg-2.21.22.tar.bz2 -> yast2-qt-pkg-2.21.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.22/VERSION.cmake new/yast2-qt-pkg-2.21.24/VERSION.cmake --- old/yast2-qt-pkg-2.21.22/VERSION.cmake 2012-03-23 11:07:10.000000000 +0100 +++ new/yast2-qt-pkg-2.21.24/VERSION.cmake 2012-04-27 10:55:19.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "22") +SET(VERSION_PATCH "24") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.22/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.21.24/package/yast2-qt-pkg.changes --- old/yast2-qt-pkg-2.21.22/package/yast2-qt-pkg.changes 2012-03-23 11:07:10.000000000 +0100 +++ new/yast2-qt-pkg-2.21.24/package/yast2-qt-pkg.changes 2012-04-27 10:55:19.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Apr 27 10:54:25 CEST 2012 - tgoettlicher@suse.de + +- Workaround for gcc 4.7 issues +- 2.21.24 + +------------------------------------------------------------------- +Thu Apr 26 11:03:07 CEST 2012 - tgoettlicher@suse.de + +- Added package group for unneeded packages +- 2.21.23 + +------------------------------------------------------------------- Fri Mar 23 11:05:38 CET 2012 - tgoettlicher@suse.de - Fixed bnc#704123: When updating packages, same version numbers in different repositories confuse YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.22/src/YQPkgPackageKitGroupsFilterView.cc new/yast2-qt-pkg-2.21.24/src/YQPkgPackageKitGroupsFilterView.cc --- old/yast2-qt-pkg-2.21.22/src/YQPkgPackageKitGroupsFilterView.cc 2012-03-23 11:07:10.000000000 +0100 +++ new/yast2-qt-pkg-2.21.24/src/YQPkgPackageKitGroupsFilterView.cc 2012-04-27 10:55:19.000000000 +0200 @@ -93,6 +93,7 @@ case YPKG_GROUP_SUGGESTED: return _( "Suggested Packages" ); case YPKG_GROUP_RECOMMENDED: return _( "Recommended Packages"); case YPKG_GROUP_ORPHANED: return _( "Orphaned Packages" ); + case YPKG_GROUP_UNNEEDED: return _( "Unneeded Packages" ); case YPKG_GROUP_MULTIVERSION: return _( "Multiversion Packages" ); // Intentionally omitting 'default' case so gcc can catch unhandled enums @@ -140,6 +141,7 @@ case YPKG_GROUP_SUGGESTED: return( "package_edutainment_languages" ); case YPKG_GROUP_RECOMMENDED: return( "package_edutainment_languages" ); case YPKG_GROUP_ORPHANED: return( "package_edutainment_languages" ); + case YPKG_GROUP_UNNEEDED: return( "package_edutainment_languages" ); case YPKG_GROUP_MULTIVERSION: return( "package_edutainment_languages" ); case YPKG_GROUP_ALL: return( "package_main" ); @@ -242,6 +244,7 @@ _groupsMap[ YPKG_GROUP_RECOMMENDED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_RECOMMENDED ); _groupsMap[ YPKG_GROUP_SUGGESTED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_SUGGESTED ); _groupsMap[ YPKG_GROUP_ORPHANED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_ORPHANED ); + _groupsMap[ YPKG_GROUP_UNNEDED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_UNNEEDED ); if ( ! zypp::sat::Pool::instance().multiversionEmpty() ) _groupsMap[ YPKG_GROUP_MULTIVERSION] = new YQPkgPackageKitGroup( this, YPKG_GROUP_MULTIVERSION ); @@ -320,7 +323,8 @@ // to solve first if ( _selectedGroup == YPKG_GROUP_SUGGESTED || _selectedGroup == YPKG_GROUP_RECOMMENDED || - _selectedGroup == YPKG_GROUP_ORPHANED ) + _selectedGroup == YPKG_GROUP_ORPHANED || + _selectedGroup == YPKG_GROUP_UNNEEDED ) { // set the busy cursor for the solving QApplication::setOverrideCursor(Qt::WaitCursor); @@ -377,6 +381,13 @@ emit filterMatch( selectable, pkg ); return true; } + if ( selectedGroup() == YPKG_GROUP_UNNEEDED && + zypp::PoolItem(pkg).status().isUnneeded() ) + { + emit filterMatch( selectable, pkg ); + return true; + } + if ( selectedGroup() == YPKG_GROUP_MULTIVERSION && selectable->multiversionInstall() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.22/src/YQPkgPackageKitGroupsFilterView.h new/yast2-qt-pkg-2.21.24/src/YQPkgPackageKitGroupsFilterView.h --- old/yast2-qt-pkg-2.21.22/src/YQPkgPackageKitGroupsFilterView.h 2012-03-23 11:07:10.000000000 +0100 +++ new/yast2-qt-pkg-2.21.24/src/YQPkgPackageKitGroupsFilterView.h 2012-04-27 10:55:19.000000000 +0200 @@ -92,6 +92,7 @@ YPKG_GROUP_SUGGESTED, YPKG_GROUP_RECOMMENDED, YPKG_GROUP_ORPHANED, + YPKG_GROUP_UNNEEDED, YPKG_GROUP_MULTIVERSION, YPKG_GROUP_ALL, } YPkgGroupEnum; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.22/yast2-qt-pkg.spec.in new/yast2-qt-pkg-2.21.24/yast2-qt-pkg.spec.in --- old/yast2-qt-pkg-2.21.22/yast2-qt-pkg.spec.in 2012-03-23 11:07:10.000000000 +0100 +++ new/yast2-qt-pkg-2.21.24/yast2-qt-pkg.spec.in 2012-04-27 10:55:19.000000000 +0200 @@ -12,9 +12,15 @@ Requires: yast2-qt >= 2.20.0 %requires_ge libqt4 BuildRequires: yast2-qt-devel >= 2.20.0 -BuildRequires: libzypp-devel >= 7.4.0 +BuildRequires: libzypp-devel >= 11.4.0 BuildRequires: yast2-libyui-devel >= 2.20.0 -Requires: libzypp >= 7.4.0 +%if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif +Requires: libzypp >= 11.4.0 Requires: yast2-libyui >= 2.20.0 Requires: yast2_theme >= 2.16.1 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 @@ -31,6 +37,10 @@ %build mkdir build cd build +%if 0%{?force_gcc_46} +export CC=gcc-4.6 +export CXX=g++-4.6 +%endif export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org