Hello community, here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory checked in at 2013-08-10 12:18:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old) and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-pkg" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes 2013-07-18 17:32:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new/libyui-qt-pkg.changes 2013-08-10 12:18:13.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Aug 2 15:08:35 CEST 2013 - [email protected] + +- bnc#831758: fix symbol icons +- Version 2.42.13 + +------------------------------------------------------------------- +Tue Jul 30 13:10:44 CEST 2013 - [email protected] + +- check pick list and installed obj for package classification +- Version 2.42.12 + +------------------------------------------------------------------- Old: ---- libyui-qt-pkg-2.42.11.tar.bz2 New: ---- libyui-qt-pkg-2.42.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-pkg-doc.spec ++++++ --- /var/tmp/diff_new_pack.iXjaqn/_old 2013-08-10 12:18:14.000000000 +0200 +++ /var/tmp/diff_new_pack.iXjaqn/_new 2013-08-10 12:18:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt-pkg-doc -Version: 2.42.11 +Version: 2.42.13 Release: 0 Source: libyui-qt-pkg-%{version}.tar.bz2 ++++++ libyui-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.iXjaqn/_old 2013-08-10 12:18:14.000000000 +0200 +++ /var/tmp/diff_new_pack.iXjaqn/_new 2013-08-10 12:18:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt-pkg -Version: 2.42.11 +Version: 2.42.13 Release: 0 Source: libyui-qt-pkg-%{version}.tar.bz2 @@ -131,6 +131,8 @@ %{_libdir}/yui/lib*.so.* %doc %dir %{_docdir}/libyui-qt-pkg5 %doc %{_docdir}/libyui-qt-pkg5/COPYING* +%dir %{_prefix}/share/YaST2 +%{_prefix}/share/YaST2/images %files devel %defattr(-,root,root) ++++++ libyui-qt-pkg-2.42.11.tar.bz2 -> libyui-qt-pkg-2.42.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.42.11/ChangeLog new/libyui-qt-pkg-2.42.13/ChangeLog --- old/libyui-qt-pkg-2.42.11/ChangeLog 2013-07-16 11:29:20.000000000 +0200 +++ new/libyui-qt-pkg-2.42.13/ChangeLog 2013-08-07 11:05:15.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Aug 2 15:08:35 CEST 2013 - [email protected] + +- bnc#831758: fix symbol icons +- Version 2.42.13 + +------------------------------------------------------------------- +Tue Jul 30 13:10:44 CEST 2013 - [email protected] + +- check pick list and installed obj for package classification +- Version 2.42.12 + +------------------------------------------------------------------- Tue Jul 16 11:07:45 CEST 2013 - [email protected] - use zypp setting as default value for "ignore recommended" menu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.42.11/DELETE_WHEN_NO_LONGER_NEEDED_yast2-qt-pkg.spec.in new/libyui-qt-pkg-2.42.13/DELETE_WHEN_NO_LONGER_NEEDED_yast2-qt-pkg.spec.in --- old/libyui-qt-pkg-2.42.11/DELETE_WHEN_NO_LONGER_NEEDED_yast2-qt-pkg.spec.in 2013-07-16 11:29:20.000000000 +0200 +++ new/libyui-qt-pkg-2.42.13/DELETE_WHEN_NO_LONGER_NEEDED_yast2-qt-pkg.spec.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -@HEADERCOMMENT@ - - -@HEADER@ -Group: System/YaST -License: GPL-2.0+ -BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel -BuildRequires: libxslt perl-XML-Writer libqt4-devel sgml-skel update-desktop-files - -Summary: YaST2 - Graphical User Interface -BuildRequires: yast2-devtools >= 2.16.3 -Requires: yast2-qt >= 2.20.0 -%requires_ge libqt4 -BuildRequires: yast2-qt-devel >= 2.20.0 -BuildRequires: libzypp-devel >= 11.4.0 -BuildRequires: yast2-libyui-devel >= 2.20.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 -Provides: yast2_ui_pkg -Recommends: libqdialogsolver1 - -%description -One of several user interfaces available for YaST2, based on Qt and the -X Window System. - -%prep -%setup - -%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} \ - -DLIB=%{_lib} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 \ - .. -make %{?jobs:-j %jobs} VERBOSE=1 - -%install -cd build -make install DESTDIR=$RPM_BUILD_ROOT -cd .. - -%clean -rm -rf "$RPM_BUILD_ROOT" - - -%files -%defattr (-, root, root) -%doc COPYING -%_libdir/YaST2/plugin/libpy2qt_pkg.so.* -%_libdir/YaST2/plugin/libpy2qt_pkg.so - -%dir %_prefix/share/YaST2/images -%_prefix/share/YaST2/images/* - -%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.42.11/PROJECTINFO.cmake new/libyui-qt-pkg-2.42.13/PROJECTINFO.cmake --- old/libyui-qt-pkg-2.42.11/PROJECTINFO.cmake 2013-07-16 11:29:20.000000000 +0200 +++ new/libyui-qt-pkg-2.42.13/PROJECTINFO.cmake 2013-08-07 11:05:15.000000000 +0200 @@ -19,8 +19,12 @@ ## Things to cleanup; probably too yast2 related +IF( NOT PREFIX ) + SET( PREFIX "/usr" ) +ENDIF( NOT PREFIX ) + # used in src/icons and YQPackageSelectorHelp.cc (via -DHELPIMAGEDIR) probably specific to this file -SET( INSTALL_HELP_ICONS_DIR "${CMAKE_INSTALL_PREFIX}/share/YaST2/images" ) +SET( INSTALL_HELP_ICONS_DIR "${PREFIX}/share/YaST2/images" ) # maybe '#include <yui/Libyui_config.h>' rather than using '-DTHEMEDIR' -SET( YUIQT_THEMEDIR "${CMAKE_INSTALL_PREFIX}/share/YaST2/theme" ) +SET( YUIQT_THEMEDIR "${PREFIX}/share/YaST2/theme" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.42.11/VERSION.cmake new/libyui-qt-pkg-2.42.13/VERSION.cmake --- old/libyui-qt-pkg-2.42.11/VERSION.cmake 2013-07-16 11:29:20.000000000 +0200 +++ new/libyui-qt-pkg-2.42.13/VERSION.cmake 2013-08-07 11:05:15.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "42" ) -SET( VERSION_PATCH "11" ) +SET( VERSION_PATCH "13" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.42.11/libyui-qt-pkg.spec.in new/libyui-qt-pkg-2.42.13/libyui-qt-pkg.spec.in --- old/libyui-qt-pkg-2.42.11/libyui-qt-pkg.spec.in 2013-07-16 11:29:20.000000000 +0200 +++ new/libyui-qt-pkg-2.42.13/libyui-qt-pkg.spec.in 2013-08-07 11:05:15.000000000 +0200 @@ -130,6 +130,8 @@ %{_libdir}/@BASELIB@/lib*.so.* %doc %dir %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@ %doc %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@/COPYING* +%dir %{_prefix}/share/YaST2 +%{_prefix}/share/YaST2/images %files devel %defattr(-,root,root) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.42.11/src/CMakeLists.txt new/libyui-qt-pkg-2.42.13/src/CMakeLists.txt --- old/libyui-qt-pkg-2.42.11/src/CMakeLists.txt 2013-07-16 11:29:20.000000000 +0200 +++ new/libyui-qt-pkg-2.42.13/src/CMakeLists.txt 2013-08-07 11:05:15.000000000 +0200 @@ -1 +1,2 @@ PROCESS_SOURCES() +SUBDIRS(icons) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.42.11/src/YQPkgPackageKitGroupsFilterView.cc new/libyui-qt-pkg-2.42.13/src/YQPkgPackageKitGroupsFilterView.cc --- old/libyui-qt-pkg-2.42.11/src/YQPkgPackageKitGroupsFilterView.cc 2013-07-16 11:29:20.000000000 +0200 +++ new/libyui-qt-pkg-2.42.13/src/YQPkgPackageKitGroupsFilterView.cc 2013-08-07 11:05:15.000000000 +0200 @@ -282,31 +282,30 @@ for ( ZyppPoolIterator it = zyppPkgBegin(); it != zyppPkgEnd(); ++it ) - { - ZyppSel selectable = *it; - - // Multiple instances of this package may or may not be in the same - // group, so let's check both the installed version (if there - // is any) and the candidate version. - // - // Make sure we emit only one filterMatch() signal if both exist - // and both are in the same group. We don't want multiple list - // entries for the same package! - - bool match = - check( selectable, tryCastToZyppPkg( selectable->candidateObj() ) ) || - check( selectable, tryCastToZyppPkg( selectable->installedObj() ) ); - - // If there is neither an installed nor a candidate package, check - // any other instance. - - if ( ! match && - ! selectable->candidateObj() && - ! selectable->installedObj() ) - check( selectable, tryCastToZyppPkg( selectable->theObj() ) ); - } + { + ZyppSel selectable = *it; + bool match = false; + + // If there is an installed obj, check this first. The bits are set for the installed + // obj only and the installed obj is not contained in the pick list if there in an + // identical candidate available from a repo. + if ( selectable->installedObj() ) + { + match = check( selectable, tryCastToZyppPkg( selectable->installedObj() ) ); + } + // And then check the pick list which contain all availables and all objects for multi + // version packages and the installed obj if there isn't same version in a repo. + if ( !match ) + { + zypp::ui::Selectable::picklist_iterator it = selectable->picklistBegin(); + while ( it != selectable->picklistEnd() && !match ) + { + check( selectable, tryCastToZyppPkg( *it ) ); + ++it; + } + } + } } - emit filterFinished(); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
