diff --git a/ChangeLog b/ChangeLog index f9ea4f3..e04405a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Aug 2 15:08:35 CEST 2013 - tgoettlicher@suse.de + +- bnc#831758: fix symbol icons +- Version 2.42.13 + +------------------------------------------------------------------- +Tue Jul 30 13:10:44 CEST 2013 - tgoettlicher@suse.de + +- check pick list and installed obj for package classification +- Version 2.42.12 + ------------------------------------------------------------------- Tue Jul 16 11:07:45 CEST 2013 - tgoettlicher@suse.de diff --git a/DELETE_WHEN_NO_LONGER_NEEDED_yast2-qt-pkg.spec.in b/DELETE_WHEN_NO_LONGER_NEEDED_yast2-qt-pkg.spec.in deleted file mode 100644 index 90e0dfd..0000000 --- a/DELETE_WHEN_NO_LONGER_NEEDED_yast2-qt-pkg.spec.in +++ /dev/null @@ -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 --git a/PROJECTINFO.cmake b/PROJECTINFO.cmake index be0d591..4c4e2d5 100644 --- a/PROJECTINFO.cmake +++ b/PROJECTINFO.cmake @@ -19,8 +19,12 @@ SET( DESCRIPTION "This package contains the Qt package selector\ncomponen ## 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 ' rather than using '-DTHEMEDIR' -SET( YUIQT_THEMEDIR "${CMAKE_INSTALL_PREFIX}/share/YaST2/theme" ) +SET( YUIQT_THEMEDIR "${PREFIX}/share/YaST2/theme" ) diff --git a/VERSION.cmake b/VERSION.cmake index 576981e..2f0881e 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -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 --git a/libyui-qt-pkg.spec.in b/libyui-qt-pkg.spec.in index 0f77cc2..5819302 100644 --- a/libyui-qt-pkg.spec.in +++ b/libyui-qt-pkg.spec.in @@ -130,6 +130,7 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/@BASELIB@/lib*.so.* %doc %dir %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@ %doc %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@/COPYING* +%{_prefix}/share/YaST2/images %files devel %defattr(-,root,root) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 926b807..e255fc8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1 +1,2 @@ PROCESS_SOURCES() +SUBDIRS(icons) diff --git a/src/YQPkgPackageKitGroupsFilterView.cc b/src/YQPkgPackageKitGroupsFilterView.cc index 5b3d0f9..3686500 100644 --- a/src/YQPkgPackageKitGroupsFilterView.cc +++ b/src/YQPkgPackageKitGroupsFilterView.cc @@ -282,31 +282,30 @@ YQPkgPackageKitGroupsFilterView::filter() 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(); }