Hello community,
here is the log from the commit of package libyui-gtk-pkg for openSUSE:Factory
checked in at 2013-05-13 20:22:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-gtk-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-gtk-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-gtk-pkg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-gtk-pkg/libyui-gtk-pkg.changes
2012-12-12 13:10:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-gtk-pkg.new/libyui-gtk-pkg.changes
2013-05-13 20:22:51.000000000 +0200
@@ -1,0 +2,32 @@
+Fri May 10 10:40:00 UTC 2013 - bjoern.es...@gmail.com
+
+- use a common toplevel CMakeLists.txt
+- fix building *-doc pkgs
+- introduce bootstrap.sh
+- Version 2.42.7
+
+-------------------------------------------------------------------
+Mon May 6 12:08:51 UTC 2013 - bjoern.es...@gmail.com
+
+- use SONAME from libyui instead of VERSION.cmake
+- Version 2.42.6
+
+-------------------------------------------------------------------
+Mon May 6 10:05:19 CEST 2013 - tgoettlic...@suse.de
+
+- Fixed so version
+- Version 2.42.5
+
+-------------------------------------------------------------------
+Thu May 2 10:19:52 CEST 2013 - tgoettlic...@suse.de
+
+- Fixed translation (bnc#721389)
+- Version 2.42.4
+
+-------------------------------------------------------------------
+Tue Apr 2 12:16:25 CEST 2013 - tgoettlic...@suse.de
+
+- Applied patch by Yasuhiko Kamata (#bnc 786650)
+- Version 2.42.3
+
+-------------------------------------------------------------------
Old:
----
libyui-gtk-pkg-2.42.2.tar.bz2
New:
----
libyui-gtk-pkg-2.42.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-gtk-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.7Wf5ct/_old 2013-05-13 20:22:52.000000000 +0200
+++ /var/tmp/diff_new_pack.7Wf5ct/_new 2013-05-13 20:22:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-gtk-pkg (Version 2.42.2)
+# spec file for package libyui-gtk-pkg (Version 2.42.7)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -16,7 +16,7 @@
#
Name: libyui-gtk-pkg-doc
-Version: 2.42.2
+Version: 2.42.7
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-gtk-pkg-%{version}.tar.bz2
@@ -30,7 +30,7 @@
BuildRequires: texlive-latex
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
-BuildRequires: libyui-devel
+BuildRequires: libyui-devel >= 3.0.4
URL: http://github.com/libyui/
@@ -55,6 +55,8 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+./bootstrap.sh %{_prefix}
+
mkdir build
cd build
cmake .. \
@@ -68,7 +70,7 @@
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
-%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui-gtk-pkg4
+%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui-gtk-pkg5
%clean
@@ -77,6 +79,6 @@
%files
%defattr(-,root,root)
-%doc %{_docdir}/libyui-gtk-pkg4
+%doc %{_docdir}/libyui-gtk-pkg5
%changelog
++++++ libyui-gtk-pkg.spec ++++++
--- /var/tmp/diff_new_pack.7Wf5ct/_old 2013-05-13 20:22:52.000000000 +0200
+++ /var/tmp/diff_new_pack.7Wf5ct/_new 2013-05-13 20:22:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-gtk-pkg (Version 2.42.2)
+# spec file for package libyui-gtk-pkg (Version 2.42.7)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,7 +17,7 @@
# norootforbuild
Name: libyui-gtk-pkg
-Version: 2.42.2
+Version: 2.42.7
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-gtk-pkg-%{version}.tar.bz2
@@ -27,12 +27,12 @@
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkg-config
-BuildRequires: libyui-devel
+BuildRequires: libyui-devel >= 3.0.4
BuildRequires: gtk3-devel
%define libyui_gtk_devel_version libyui-gtk-devel >= 2.42.0
BuildRequires: %{libyui_gtk_devel_version}
-%define libzypp_devel_version libzypp-devel >= 11.4.0
+%define libzypp_devel_version libzypp-devel >= 13.0.0
BuildRequires: %{libzypp_devel_version}
URL: http://github.com/libyui/
@@ -43,12 +43,12 @@
component for libYUI.
-%package -n libyui-gtk-pkg4
+%package -n libyui-gtk-pkg5
Group: System/Libraries
-Requires: libyui4
-Provides: libyui-gtk = %{version}
+Requires: libyui5
+Provides: libyui-gtk-pkg = %{version}
Provides: yast2-gtk-pkg = %{version}
Obsoletes: yast2-gtk-pkg < %{version}
Provides: libyui_pkg
@@ -56,7 +56,7 @@
URL: http://github.com/libyui/
Summary: Libyui - Gtk Package Selector
-%description -n libyui-gtk-pkg4
+%description -n libyui-gtk-pkg5
This package contains the Gtk package selector
component for libYUI.
@@ -66,7 +66,7 @@
Group: Development/Languages/C and C++
-Requires: libyui-gtk-pkg4 = %{version}
+Requires: libyui-gtk-pkg5 = %{version}
Requires: glibc-devel
Requires: libstdc++-devel
Requires: boost-devel
@@ -92,6 +92,8 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+./bootstrap.sh %{_prefix}
+
mkdir build
cd build
@@ -117,27 +119,27 @@
%install
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
-install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui-gtk-pkg4/
+install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui-gtk-pkg5/
install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui
-install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui-gtk-pkg4/
+install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui-gtk-pkg5/
%clean
rm -rf "$RPM_BUILD_ROOT"
-%post -n libyui-gtk-pkg4 -p /sbin/ldconfig
+%post -n libyui-gtk-pkg5 -p /sbin/ldconfig
-%postun -n libyui-gtk-pkg4 -p /sbin/ldconfig
+%postun -n libyui-gtk-pkg5 -p /sbin/ldconfig
-%files -n libyui-gtk-pkg4
+%files -n libyui-gtk-pkg5
%defattr(-,root,root)
%dir %{_libdir}/yui
%{_libdir}/yui/lib*.so.*
-%doc %dir %{_docdir}/libyui-gtk-pkg4
-%doc %{_docdir}/libyui-gtk-pkg4/COPYING*
+%doc %dir %{_docdir}/libyui-gtk-pkg5
+%doc %{_docdir}/libyui-gtk-pkg5/COPYING*
%files devel
%defattr(-,root,root)
-%dir %{_docdir}/libyui-gtk-pkg4
+%dir %{_docdir}/libyui-gtk-pkg5
%{_libdir}/yui/lib*.so
%{_prefix}/include/yui
%{_libdir}/pkgconfig/libyui-gtk-pkg.pc
++++++ libyui-gtk-pkg-2.42.2.tar.bz2 -> libyui-gtk-pkg-2.42.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/.gitignore
new/libyui-gtk-pkg-2.42.7/.gitignore
--- old/libyui-gtk-pkg-2.42.2/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/libyui-gtk-pkg-2.42.7/.gitignore 2013-05-13 13:38:02.000000000
+0200
@@ -0,0 +1,114 @@
+# GNU Autotools
+Makefile.in
+/autom4te.cache
+/aclocal.m4
+/compile
+/configure
+/depcomp
+/install-sh
+/missing
+
+# Object files
+*.o
+
+# Libraries
+*.lib
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+
+# Executables
+*.exe
+*.out
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+
+# Compiled Dynamic libraries
+*.so
+*.so.*
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+
+# CMake
+CMakeCache.txt
+CMakeFiles
+CMakeLists.txt
+Makefile
+cmake_install.cmake
+install_manifest.txt
+
+# CMake project-bindir
+build*/
+
+# but don't exclude buildtools-dir
+!/buildtools
+
+# Archives
+# It's better to unpack these files and commit the raw source because
+# git has its own built in compression methods.
+*.7z
+*.jar
+*.rar
+*.zip
+*.gz
+*.bzip
+*.bz2
+*.xz
+*.lzma
+
+# packing-only formats
+*.iso
+*.tar
+
+# package management formats
+*.dmg
+*.xpi
+*.gem
+*.egg
+*.deb
+*.rpm
+
+# CVS
+/CVS/*
+*/CVS/*
+.cvsignore
+*/.cvsignore*~
+\#*\#
+
+# Emacs
+/.emacs.desktop
+/.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
+.\#*
+
+# Emacs Org-mode
+.org-id-locations
+
+# Unix/Linux
+*_archive
+.*
+!.gitignore
+*~
+*.bak
+*.log
+*.old
+*swp
+tmp
+
+# KDE
+.directory
+
+# Subversion
+.svn/
+
+# OBS commit
+package/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/CMakeLists.txt
new/libyui-gtk-pkg-2.42.7/CMakeLists.txt
--- old/libyui-gtk-pkg-2.42.2/CMakeLists.txt 2012-12-12 11:01:34.000000000
+0100
+++ new/libyui-gtk-pkg-2.42.7/CMakeLists.txt 2013-05-13 20:22:52.000000000
+0200
@@ -1,45 +1 @@
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
-
-INCLUDE( "${CMAKE_SOURCE_DIR}/PROJECTINFO.cmake" )
-
-SET( BUILDTOOLS_DIR "buildtools/" )
-
-IF( NOT PREFIX )
- SET( PREFIX "/usr" )
-ENDIF( NOT PREFIX )
-
-IF( PLUGINNAME )
- SET( BUILDTOOLS_DIR "${PREFIX}/share/lib${BASELIB}/${BUILDTOOLS_DIR}" )
-ELSE( PLUGINNAME )
- SET( BUILDTOOLS_DIR "${CMAKE_SOURCE_DIR}/${BUILDTOOLS_DIR}" )
-ENDIF( PLUGINNAME )
-
-SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${BUILDTOOLS_DIR}"
"${CMAKE_MODULE_PATH}" )
-
-INCLUDE( LibyuiCommon )
-INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.cmake" )
-
-INITIALIZE()
-
-PROJECT( "${PROJECTNAME}" )
-
-INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/SOURCECONF.cmake" )
-
-SET_OPTIONS()
-SET_ENVIRONMENT()
-SET_BUILD_FLAGS()
-SET_AUTODOCS()
-
-IF( NOT DOCS_ONLY )
- FIND_LIB_DEPENDENCIES()
- FIND_LINKER_LIBS()
- CHECK_PREFIX()
- SET_SUBDIRS()
- GEN_EXPORTS()
- GEN_FILES()
- PREP_SPEC_FILES()
- SET_INSTALL_TARGET()
- PREP_OBS_TARBALL()
-ENDIF( NOT DOCS_ONLY )
-
-SUMMARY()
+symbolic link to /usr/share/libyui/buildtools/CMakeLists.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/ChangeLog
new/libyui-gtk-pkg-2.42.7/ChangeLog
--- old/libyui-gtk-pkg-2.42.2/ChangeLog 2012-12-12 11:01:34.000000000 +0100
+++ new/libyui-gtk-pkg-2.42.7/ChangeLog 2013-05-13 13:38:02.000000000 +0200
@@ -1,4 +1,36 @@
-------------------------------------------------------------------
+Fri May 10 10:40:00 UTC 2013 - bjoern.es...@gmail.com
+
+- use a common toplevel CMakeLists.txt
+- fix building *-doc pkgs
+- introduce bootstrap.sh
+- Version 2.42.7
+
+-------------------------------------------------------------------
+Mon May 6 12:08:51 UTC 2013 - bjoern.es...@gmail.com
+
+- use SONAME from libyui instead of VERSION.cmake
+- Version 2.42.6
+
+-------------------------------------------------------------------
+Mon May 6 10:05:19 CEST 2013 - tgoettlic...@suse.de
+
+- Fixed so version
+- Version 2.42.5
+
+-------------------------------------------------------------------
+Thu May 2 10:19:52 CEST 2013 - tgoettlic...@suse.de
+
+- Fixed translation (bnc#721389)
+- Version 2.42.4
+
+-------------------------------------------------------------------
+Tue Apr 2 12:16:25 CEST 2013 - tgoettlic...@suse.de
+
+- Applied patch by Yasuhiko Kamata (#bnc 786650)
+- Version 2.42.3
+
+-------------------------------------------------------------------
Wed Dec 12 10:57:27 CET 2012 - m...@suse.de
- Interim continue using deprecated history reader API
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/Makefile.cvs
new/libyui-gtk-pkg-2.42.7/Makefile.cvs
--- old/libyui-gtk-pkg-2.42.2/Makefile.cvs 2012-12-12 11:01:34.000000000
+0100
+++ new/libyui-gtk-pkg-2.42.7/Makefile.cvs 2013-05-13 13:38:02.000000000
+0200
@@ -5,6 +5,7 @@
all: configure
configure: clean
+ ./bootstrap.sh ; \
mkdir build ; \
cd build ; \
cmake .. \
@@ -20,4 +21,5 @@
cmake rebuild_cache
clean:
- rm -rf build
+ rm -rf build \
+ CMakeLists.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/PROJECTINFO.cmake
new/libyui-gtk-pkg-2.42.7/PROJECTINFO.cmake
--- old/libyui-gtk-pkg-2.42.2/PROJECTINFO.cmake 2012-12-12 11:01:34.000000000
+0100
+++ new/libyui-gtk-pkg-2.42.7/PROJECTINFO.cmake 2013-05-13 13:38:02.000000000
+0200
@@ -15,20 +15,3 @@
SET( SUMMARY "Libyui - Gtk Package Selector" )
SET( DESCRIPTION "This package contains the Gtk package
selector\ncomponent for libYUI.\n" )
-# libzypp-12.5.0 changes:
-# - HistoryLogReader: new HistoryLogData based API for parsing the new
-# history file entries (fate#312521)
-# The old HistoryItem based API is deprecated but will
-# still be available for a while if you compile with
-# -DWITH_DEPRECATED_HISTORYITEM_API.
-#
-# roughly:
-# /// - // old style
-# /// - HistoryItem::Ptr ptr;
-# /// - Date d = ptr->date;
-# /// + // new style
-# /// + HistoryLogData::Ptr ptr;
-# /// + Date d = ptr->date();
-#
-# http://doc.opensuse.org/projects/libzypp/HEAD/classzypp_1_1HistoryLog.html
-ADD_DEFINITIONS(-DWITH_DEPRECATED_HISTORYITEM_API=1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/VERSION.cmake
new/libyui-gtk-pkg-2.42.7/VERSION.cmake
--- old/libyui-gtk-pkg-2.42.2/VERSION.cmake 2012-12-12 11:01:34.000000000
+0100
+++ new/libyui-gtk-pkg-2.42.7/VERSION.cmake 2013-05-13 13:38:02.000000000
+0200
@@ -1,11 +1,11 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "42" )
-SET( VERSION_PATCH "2" )
+SET( VERSION_PATCH "7" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
##### This is need for the libyui core, ONLY.
##### These will be overridden from exports in LibyuiConfig.cmake
-SET( SONAME_MAJOR "4" )
+SET( SONAME_MAJOR "5" )
SET( SONAME_MINOR "0" )
SET( SONAME_PATCH "0" )
SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/bootstrap.sh
new/libyui-gtk-pkg-2.42.7/bootstrap.sh
--- old/libyui-gtk-pkg-2.42.2/bootstrap.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/libyui-gtk-pkg-2.42.7/bootstrap.sh 2013-05-13 13:38:02.000000000
+0200
@@ -0,0 +1,26 @@
+#!/bin/sh
+set -e
+
+prefix="/usr"
+
+if [ ! -z $1 ]
+then
+ prefix="$1"
+fi
+
+cmake_common="$prefix/share/libyui/buildtools/CMakeLists.common"
+cmake_target="./CMakeLists.txt"
+
+echo "checking for $cmake_common..."
+
+if [ -f "$cmake_common" ]
+then
+ ln -fs "$cmake_common" "$cmake_target"
+ echo "OK: linked to `pwd`/$cmake_target."
+else
+ echo " Use must have libyui(-devel) >= 3.0.4 installed"
+ echo " in \"$prefix\" first !!!"
+ exit 1
+fi
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/libyui-gtk-pkg.spec.in
new/libyui-gtk-pkg-2.42.7/libyui-gtk-pkg.spec.in
--- old/libyui-gtk-pkg-2.42.2/libyui-gtk-pkg.spec.in 2012-12-12
11:01:34.000000000 +0100
+++ new/libyui-gtk-pkg-2.42.7/libyui-gtk-pkg.spec.in 2013-05-13
13:38:02.000000000 +0200
@@ -27,12 +27,12 @@
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkg-config
-BuildRequires: libyui-devel
+BuildRequires: libyui-devel >= 3.0.4
BuildRequires: gtk3-devel
%define libyui_gtk_devel_version libyui-gtk-devel >= 2.42.0
BuildRequires: %{libyui_gtk_devel_version}
-%define libzypp_devel_version libzypp-devel >= 11.4.0
+%define libzypp_devel_version libzypp-devel >= 13.0.0
BuildRequires: %{libzypp_devel_version}
URL: @URL@
@@ -46,7 +46,7 @@
Group: System/Libraries
Requires: lib@BASELIB@@SONAME_MAJOR@
-Provides: lib@BASELIB@-gtk = %{version}
+Provides: lib@BASELIB@-gtk-pkg = %{version}
Provides: yast2-gtk-pkg = %{version}
Obsoletes: yast2-gtk-pkg < %{version}
Provides: libyui_pkg
@@ -86,6 +86,8 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+./bootstrap.sh %{_prefix}
+
mkdir build
cd build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/src/YGPackageSelector.cc
new/libyui-gtk-pkg-2.42.7/src/YGPackageSelector.cc
--- old/libyui-gtk-pkg-2.42.2/src/YGPackageSelector.cc 2012-12-12
11:01:34.000000000 +0100
+++ new/libyui-gtk-pkg-2.42.7/src/YGPackageSelector.cc 2013-05-13
13:38:02.000000000 +0200
@@ -111,16 +111,16 @@
GtkWidget *overview = ygtk_html_wrap_new();
if (onlineUpdate)
- ygtk_html_wrap_set_text (overview,
+ ygtk_html_wrap_set_text (overview, _(
"<h1><img src=\"gtk-dialog-info\"
/>Overview</h1>"
"<p>Press a patch in the list to see more
information about it.</p>"
- "<p>To install a patch, just click on its
\"checkbox\".</p>", FALSE);
+ "<p>To install a patch, just click on its
\"checkbox\".</p>"), FALSE);
else
- ygtk_html_wrap_set_text (overview,
+ ygtk_html_wrap_set_text (overview, _(
"<h1><img src=\"gtk-dialog-info\"
/>Overview</h1>"
"<p>Browse packages using the groups list on
the left.</p>"
"<p>Press a package in the list to see more
information about it.</p>"
- "<p>To install or remove a package, just click
on its \"checkbox\".</p>", FALSE);
+ "<p>To install or remove a package, just click
on its \"checkbox\".</p>"), FALSE);
m_overview = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW
(m_overview),
@@ -420,6 +420,9 @@
gtk_widget_show_all (dialog);
bool apply = (gtk_dialog_run (GTK_DIALOG (dialog)) ==
GTK_RESPONSE_APPLY);
+ // disconnect before destroying
+ g_signal_handlers_disconnect_by_data (G_OBJECT (view), store);
+
gtk_widget_destroy (dialog);
return apply;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/src/ygtkpkghistorydialog.cc
new/libyui-gtk-pkg-2.42.7/src/ygtkpkghistorydialog.cc
--- old/libyui-gtk-pkg-2.42.2/src/ygtkpkghistorydialog.cc 2012-12-12
11:01:34.000000000 +0100
+++ new/libyui-gtk-pkg-2.42.7/src/ygtkpkghistorydialog.cc 2013-05-13
13:38:02.000000000 +0200
@@ -235,7 +235,7 @@
ZyppHistoryParser (Handler *handler)
: handler (handler)
{
- zypp::parser::HistoryLogReader parser (FILENAME, boost::ref
(*this));
+ zypp::parser::HistoryLogReader parser (FILENAME,
zypp::parser::HistoryLogReader::Options(), boost::ref (*this));
try {
parser.readAll();
}
@@ -245,9 +245,9 @@
}
}
- bool operator() (const zypp::HistoryItem::Ptr &item)
+ bool operator() (const zypp::HistoryLogData::Ptr &item)
{
- std::string date (item->date.form ("%d %B %Y"));
+ std::string date (item->date().form ("%d %B %Y"));
if (_date != date) {
handler->date (date, _date.empty());
_date = date;
@@ -255,18 +255,18 @@
std::string action, name, descrpt, repoName, repoUrl, reqby, t;
bool autoreq = false;
- switch (item->action.toEnum()) {
+ switch (item->action().toEnum()) {
case zypp::HistoryActionID::NONE_e:
break;
case zypp::HistoryActionID::INSTALL_e: {
- zypp::HistoryItemInstall *_item =
- static_cast <zypp::HistoryItemInstall
*> (item.get());
- name = _item->name;
- descrpt = _item->edition.version();
- Ypp::getRepositoryFromAlias (_item->repoalias,
repoName, repoUrl);
- reqby = _item->reqby; autoreq = reqby.empty();
+ zypp::HistoryLogDataInstall *_item =
+ static_cast
<zypp::HistoryLogDataInstall *> (item.get());
+ name = _item->name();
+ descrpt = _item->edition().version();
+ Ypp::getRepositoryFromAlias
(_item->repoAlias(), repoName, repoUrl);
+ reqby = _item->reqby(); autoreq = reqby.empty();
reqby = reqbyTreatment (reqby);
- zypp::Edition edition = _item->edition;
+ zypp::Edition edition = _item->edition();
std::map <std::string, zypp::Edition>::iterator
it;
it = installed.find (name);
if (it == installed.end())
@@ -284,12 +284,12 @@
break;
}
case zypp::HistoryActionID::REMOVE_e: {
- zypp::HistoryItemRemove *_item =
- static_cast <zypp::HistoryItemRemove *>
(item.get());
+ zypp::HistoryLogDataRemove *_item =
+ static_cast <zypp::HistoryLogDataRemove
*> (item.get());
action = _("remove");
- name = _item->name;
- descrpt = _item->edition.version();
- reqby = _item->reqby; autoreq = reqby.empty();
+ name = _item->name();
+ descrpt = _item->edition().version();
+ reqby = _item->reqby(); autoreq = reqby.empty();
reqby = reqbyTreatment (reqby);
std::map <std::string, zypp::Edition>::iterator
it;
it = installed.find (name);
@@ -298,33 +298,33 @@
break;
}
case zypp::HistoryActionID::REPO_ADD_e: {
- zypp::HistoryItemRepoAdd *_item =
- static_cast <zypp::HistoryItemRepoAdd
*> (item.get());
+ zypp::HistoryLogDataRepoAdd *_item =
+ static_cast
<zypp::HistoryLogDataRepoAdd *> (item.get());
action = _("add repository");
- Ypp::getRepositoryFromAlias (_item->alias,
name, t);
- descrpt = _item->url.asString();
+ Ypp::getRepositoryFromAlias (_item->alias(),
name, t);
+ descrpt = _item->url().asString();
break;
}
case zypp::HistoryActionID::REPO_REMOVE_e: {
- zypp::HistoryItemRepoRemove *_item =
- static_cast
<zypp::HistoryItemRepoRemove *> (item.get());
+ zypp::HistoryLogDataRepoRemove *_item =
+ static_cast
<zypp::HistoryLogDataRepoRemove *> (item.get());
action = _("remove repository");
- name = _item->alias;
+ name = _item->alias();
break;
}
case zypp::HistoryActionID::REPO_CHANGE_ALIAS_e: {
- zypp::HistoryItemRepoAliasChange *_item =
- static_cast
<zypp::HistoryItemRepoAliasChange *> (item.get());
+ zypp::HistoryLogDataRepoAliasChange *_item =
+ static_cast
<zypp::HistoryLogDataRepoAliasChange *> (item.get());
action = _("change repository alias");
- name = _item->oldalias + " -> " +
_item->newalias;
+ name = _item->oldAlias() + " -> " +
_item->newAlias();
break;
}
case zypp::HistoryActionID::REPO_CHANGE_URL_e: {
- zypp::HistoryItemRepoUrlChange *_item =
- static_cast
<zypp::HistoryItemRepoUrlChange *> (item.get());
+ zypp::HistoryLogDataRepoUrlChange *_item =
+ static_cast
<zypp::HistoryLogDataRepoUrlChange *> (item.get());
action = _("change repository url");
- Ypp::getRepositoryFromAlias (_item->alias,
name, t);
- descrpt = _item->newurl.asString();
+ Ypp::getRepositoryFromAlias (_item->alias(),
name, t);
+ descrpt = _item->newUrl().asString();
break;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-pkg-2.42.2/src/ygtkpkgvestigialdialog.cc
new/libyui-gtk-pkg-2.42.7/src/ygtkpkgvestigialdialog.cc
--- old/libyui-gtk-pkg-2.42.2/src/ygtkpkgvestigialdialog.cc 2012-12-12
11:01:34.000000000 +0100
+++ new/libyui-gtk-pkg-2.42.7/src/ygtkpkgvestigialdialog.cc 2013-05-13
13:38:02.000000000 +0200
@@ -26,7 +26,7 @@
ZyppVestigialParser()
{
- zypp::parser::HistoryLogReader parser (FILENAME, boost::ref
(*this));
+ zypp::parser::HistoryLogReader parser (FILENAME,
zypp::parser::HistoryLogReader::Options(), boost::ref (*this));
try {
parser.readAll();
}
@@ -36,16 +36,16 @@
}
}
- bool operator() (const zypp::HistoryItem::Ptr &item)
+ bool operator() (const zypp::HistoryLogData::Ptr &item)
{
- if (item->action.toEnum() == zypp::HistoryActionID::INSTALL_e) {
- zypp::HistoryItemInstall *_item =
- static_cast <zypp::HistoryItemInstall *>
(item.get());
+ if (item->action().toEnum() ==
zypp::HistoryActionID::INSTALL_e) {
+ zypp::HistoryLogDataInstall *_item =
+ static_cast <zypp::HistoryLogDataInstall *>
(item.get());
- const std::string &name (_item->name);
- bool autoreq = _item->reqby.empty();
+ const std::string &name (_item->name());
+ bool autoreq = _item->reqby().empty();
std::string repoName, repoUrl;
- Ypp::getRepositoryFromAlias (_item->repoalias,
repoName, repoUrl);
+ Ypp::getRepositoryFromAlias (_item->repoAlias(),
repoName, repoUrl);
bool update = repoUrl.find ("update") !=
std::string::npos;
if (!update) { // updates are ambiguous
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
