Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2018-11-08 09:42:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp" Thu Nov 8 09:42:19 2018 rev:406 rq:645331 version:17.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2018-10-22 11:04:48.612199523 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2018-11-08 09:42:21.205530561 +0100 @@ -1,0 +2,8 @@ +Mon Oct 29 12:20:40 CET 2018 - [email protected] + +- Adapt to changed type names in libsolv-0.7 +- Package needreboot file (fate#326451) +- Fix definitions of gettext macros (fixes #135) +- version 17.8.1 (2) + +------------------------------------------------------------------- Old: ---- libzypp-17.8.0.tar.bz2 New: ---- libzypp-17.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.bGBsgU/_old 2018-11-08 09:42:22.653528878 +0100 +++ /var/tmp/diff_new_pack.bGBsgU/_new 2018-11-08 09:42:22.689528837 +0100 @@ -17,7 +17,7 @@ Name: libzypp -Version: 17.8.0 +Version: 17.8.1 Release: 0 Url: https://github.com/openSUSE/libzypp Summary: Package, Patch, Pattern, and Product Management @@ -241,6 +241,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/system mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/urlresolver mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp +mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp/NeedReboot.d mkdir -p $RPM_BUILD_ROOT%{_var}/log/zypp mkdir -p $RPM_BUILD_ROOT%{_var}/cache/zypp @@ -349,6 +350,8 @@ %config(noreplace) %{_sysconfdir}/zypp/systemCheck %config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr %dir %{_var}/lib/zypp +%config(noreplace) %{_var}/lib/zypp/NeedReboot +%dir %{_var}/lib/zypp/NeedReboot.d %dir %{_var}/log/zypp %dir %{_var}/cache/zypp %{_prefix}/lib/zypp ++++++ libzypp-17.8.0.tar.bz2 -> libzypp-17.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/CMakeLists.txt new/libzypp-17.8.1/CMakeLists.txt --- old/libzypp-17.8.0/CMakeLists.txt 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.8.1/CMakeLists.txt 2018-10-29 15:22:45.000000000 +0100 @@ -234,6 +234,9 @@ MESSAGE(STATUS "zypp.conf will be installed in ${SYSCONFDIR}/zypp") INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/zypp.conf DESTINATION ${SYSCONFDIR}/zypp ) +MESSAGE(STATUS "NeedReboot will be installed in /var/lib/zypp/") +INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/NeedReboot DESTINATION /var/lib/zypp ) + #install systemCheck MESSAGE(STATUS "systemCheck will be installed in ${SYSCONFDIR}/zypp") INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/systemCheck DESTINATION ${SYSCONFDIR}/zypp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/NeedReboot new/libzypp-17.8.1/NeedReboot --- old/libzypp-17.8.0/NeedReboot 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-17.8.1/NeedReboot 2018-10-29 15:22:45.000000000 +0100 @@ -0,0 +1,14 @@ +# This file contains the default list of packages +# which will trigger the /var/run/reboot-needed hint. +# Do not edit this file, instead use the NeedReboot.d +# directory for adding additional packages to the list +kernel-default +kernel-default-base +kernel-firmware +glibc +systemd +udev +libopenssl1_0_0 +libopenssl1_1 +gnutls +dbus-1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/VERSION.cmake new/libzypp-17.8.1/VERSION.cmake --- old/libzypp-17.8.0/VERSION.cmake 2018-10-12 14:03:12.000000000 +0200 +++ new/libzypp-17.8.1/VERSION.cmake 2018-10-29 12:22:56.000000000 +0100 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "2") SET(LIBZYPP_MINOR "8") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 17.8.0 (2) +# LAST RELEASED: 17.8.1 (2) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/libzypp.spec.cmake new/libzypp-17.8.1/libzypp.spec.cmake --- old/libzypp-17.8.0/libzypp.spec.cmake 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.8.1/libzypp.spec.cmake 2018-10-29 15:22:45.000000000 +0100 @@ -241,6 +241,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/system mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/urlresolver mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp +mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp/NeedReboot.d mkdir -p $RPM_BUILD_ROOT%{_var}/log/zypp mkdir -p $RPM_BUILD_ROOT%{_var}/cache/zypp @@ -349,6 +350,8 @@ %config(noreplace) %{_sysconfdir}/zypp/systemCheck %config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr %dir %{_var}/lib/zypp +%config(noreplace) %{_var}/lib/zypp/NeedReboot +%dir %{_var}/lib/zypp/NeedReboot.d %dir %{_var}/log/zypp %dir %{_var}/cache/zypp %{_prefix}/lib/zypp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/package/libzypp.changes new/libzypp-17.8.1/package/libzypp.changes --- old/libzypp-17.8.0/package/libzypp.changes 2018-10-12 14:03:12.000000000 +0200 +++ new/libzypp-17.8.1/package/libzypp.changes 2018-10-29 12:22:56.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Oct 29 12:20:40 CET 2018 - [email protected] + +- Adapt to changed type names in libsolv-0.7 +- Package needreboot file (fate#326451) +- Fix definitions of gettext macros (fixes #135) +- version 17.8.1 (2) + +------------------------------------------------------------------- Fri Oct 12 14:01:19 CEST 2018 - [email protected] - Add infrastructure to flag specific packages to trigger a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/po/zh_CN.po new/libzypp-17.8.1/po/zh_CN.po --- old/libzypp-17.8.0/po/zh_CN.po 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.8.1/po/zh_CN.po 2018-10-13 08:02:10.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-08-03 11:09+0200\n" -"PO-Revision-Date: 2018-09-01 06:01+0000\n" +"PO-Revision-Date: 2018-10-13 06:01+0000\n" "Last-Translator: H. Zeng <[email protected]>\n" "Language-Team: Chinese (China) " "<https://l10n.opensuse.org/projects/libzypp/master/zh_CN/>\n" @@ -4190,7 +4190,7 @@ #: zypp/media/MediaException.cc:195 #, c-format, boost-format msgid "Downloaded data exceeded the expected filesize '%s' of '%s'." -msgstr "下载到的数据超出了 '%2$s' 中预期的文件大小 '%1$s'。" +msgstr "下载到的数据超出了预期文件大小 '%s'/'%s'。" #: zypp/media/MediaException.cc:203 #, c-format, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/RepoInfo.cc new/libzypp-17.8.1/zypp/RepoInfo.cc --- old/libzypp-17.8.0/zypp/RepoInfo.cc 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.8.1/zypp/RepoInfo.cc 2018-10-12 16:35:39.000000000 +0200 @@ -13,6 +13,7 @@ #include <vector> #include <fstream> +#include "zypp/base/Gettext.h" #include "zypp/base/LogTools.h" #include "zypp/base/DefaultIntegral.h" #include "zypp/parser/xml/XmlEscape.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/ZYppCallbacks.h new/libzypp-17.8.1/zypp/ZYppCallbacks.h --- old/libzypp-17.8.0/zypp/ZYppCallbacks.h 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.8.1/zypp/ZYppCallbacks.h 2018-10-12 16:35:39.000000000 +0200 @@ -12,7 +12,6 @@ #ifndef ZYPP_ZYPPCALLBACKS_H #define ZYPP_ZYPPCALLBACKS_H -#include "zypp/base/Gettext.h" #include "zypp/base/EnumClass.h" #include "zypp/Callback.h" #include "zypp/UserData.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/base/Gettext.h new/libzypp-17.8.1/zypp/base/Gettext.h --- old/libzypp-17.8.0/zypp/base/Gettext.h 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.8.1/zypp/base/Gettext.h 2018-10-12 16:35:39.000000000 +0200 @@ -14,22 +14,34 @@ #ifndef ZYPP_BASE_GETTEXT_H #define ZYPP_BASE_GETTEXT_H +#ifdef ZYPP_DLL //defined if zypp is compiled as DLL + /** Just tag text for translation. */ +#undef N_ #define N_(MSG) MSG -#ifdef ZYPP_DLL //defined if zypp is compiled as DLL - /** Return translated text. */ +#undef _ #define _(MSG) ::zypp::gettext::dgettext( MSG ) /** Return translated text (plural form). */ +#undef PL_ #define PL_(MSG1,MSG2,N) ::zypp::gettext::dngettext( MSG1, MSG2, N ) #else + +#ifndef N_ +#define N_(MSG) MSG +#endif +#ifndef _ #define _(MSG) ::gettext( MSG ) +#endif +#ifndef PL_ #define PL_(MSG1,MSG2,N) ::ngettext( MSG1, MSG2, N ) #endif +#endif + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/sat/Solvable.cc new/libzypp-17.8.1/zypp/sat/Solvable.cc --- old/libzypp-17.8.0/zypp/sat/Solvable.cc 2018-10-12 12:44:03.000000000 +0200 +++ new/libzypp-17.8.1/zypp/sat/Solvable.cc 2018-10-29 15:22:46.000000000 +0100 @@ -387,7 +387,7 @@ return myPool().isOnSystemByAuto( ident_r ); } - bool Solvable::identTriggersRebootHint ( const IdString &ident_r ) + bool Solvable::identTriggersRebootNeededHint ( const IdString &ident_r ) { return myPool().triggersRebootNeededHint( ident_r ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/sat/Solvable.h new/libzypp-17.8.1/zypp/sat/Solvable.h --- old/libzypp-17.8.0/zypp/sat/Solvable.h 2018-10-12 12:44:03.000000000 +0200 +++ new/libzypp-17.8.1/zypp/sat/Solvable.h 2018-10-29 15:22:46.000000000 +0100 @@ -137,9 +137,9 @@ static bool identIsAutoInstalled( const IdString & ident_r ); /** Whether installing or upgrading a solvable with the same \ref ident will trigger the reboot needed hint. */ - bool identTriggersRebootHint() const - { return identTriggersRebootHint( ident() ); } - static bool identTriggersRebootHint ( const IdString &ident_r ); + bool identTriggersRebootNeededHint() const + { return identTriggersRebootNeededHint( ident() ); } + static bool identTriggersRebootNeededHint ( const IdString &ident_r ); /** Whether different versions of this package can be installed at the same time. * Per default \c false. \see also \ref ZConfig::multiversion. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/sat/SolvableType.h new/libzypp-17.8.1/zypp/sat/SolvableType.h --- old/libzypp-17.8.0/zypp/sat/SolvableType.h 2018-10-12 12:44:03.000000000 +0200 +++ new/libzypp-17.8.1/zypp/sat/SolvableType.h 2018-10-29 15:22:46.000000000 +0100 @@ -80,7 +80,7 @@ bool onSystemByAuto() const { return satSolvable().onSystemByAuto(); } bool identIsAutoInstalled() const { return satSolvable().identIsAutoInstalled(); } bool multiversionInstall() const { return satSolvable().multiversionInstall(); } - bool identTriggersRebootHint() const { return satSolvable().identTriggersRebootHint(); } + bool identTriggersRebootNeededHint() const { return satSolvable().identTriggersRebootNeededHint(); } Date buildtime() const { return satSolvable().buildtime(); } Date installtime() const { return satSolvable().installtime(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/sat/detail/PoolMember.h new/libzypp-17.8.1/zypp/sat/detail/PoolMember.h --- old/libzypp-17.8.0/zypp/sat/detail/PoolMember.h 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.8.1/zypp/sat/detail/PoolMember.h 2018-10-29 09:30:52.000000000 +0100 @@ -12,6 +12,8 @@ #ifndef ZYPP_SAT_DETAIL_POOLMEMBER_H #define ZYPP_SAT_DETAIL_POOLMEMBER_H +#include <solv/solvversion.h> + #include "zypp/base/Hash.h" #include "zypp/base/Iterator.h" #include "zypp/base/String.h" @@ -20,6 +22,17 @@ extern "C" { // Those _Type names are exposed as sat::detail::CType below! +#if ( LIBSOLV_VERSION >= 700 ) + struct s_Dataiterator; + struct s_Datamatcher; + struct s_Map; + struct s_Pool; + struct s_Queue; + struct s_Repo; + struct s_Solvable; + struct s_Solver; + struct s_Transaction; +#else struct _Dataiterator; struct _Datamatcher; struct _Map; @@ -29,6 +42,7 @@ struct _Solvable; struct _Solver; struct _Transaction; +#endif } /////////////////////////////////////////////////////////////////// @@ -55,6 +69,17 @@ /////////////////////////////////////////////////////////////////// namespace detail { +#if ( LIBSOLV_VERSION >= 700 ) + typedef ::s_Dataiterator CDataiterator; ///< Wrapped libsolv C data type exposed as backdoor + typedef ::s_Datamatcher CDatamatcher; ///< Wrapped libsolv C data type exposed as backdoor + typedef ::s_Map CMap; ///< Wrapped libsolv C data type exposed as backdoor + typedef ::s_Pool CPool; ///< Wrapped libsolv C data type exposed as backdoor + typedef ::s_Queue CQueue; ///< Wrapped libsolv C data type exposed as backdoor + typedef ::s_Repo CRepo; ///< Wrapped libsolv C data type exposed as backdoor + typedef ::s_Solvable CSolvable; ///< Wrapped libsolv C data type exposed as backdoor + typedef ::s_Solver CSolver; ///< Wrapped libsolv C data type exposed as backdoor + typedef ::s_Transaction CTransaction; ///< Wrapped libsolv C data type exposed as backdoor +#else typedef ::_Dataiterator CDataiterator; ///< Wrapped libsolv C data type exposed as backdoor typedef ::_Datamatcher CDatamatcher; ///< Wrapped libsolv C data type exposed as backdoor typedef ::_Map CMap; ///< Wrapped libsolv C data type exposed as backdoor @@ -64,6 +89,7 @@ typedef ::_Solvable CSolvable; ///< Wrapped libsolv C data type exposed as backdoor typedef ::_Solver CSolver; ///< Wrapped libsolv C data type exposed as backdoor typedef ::_Transaction CTransaction; ///< Wrapped libsolv C data type exposed as backdoor +#endif } // namespace detail /////////////////////////////////////////////////////////////////// @@ -130,7 +156,7 @@ static const SolvableIdType systemSolvableId( 1 ); /** Id type to connect \ref Repo and sat-repo. */ - typedef ::_Repo * RepoIdType; + typedef CRepo * RepoIdType; /** Id to denote \ref Repo::noRepository. */ static const RepoIdType noRepoId( 0 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/target/TargetImpl.cc new/libzypp-17.8.1/zypp/target/TargetImpl.cc --- old/libzypp-17.8.0/zypp/target/TargetImpl.cc 2018-10-12 12:44:03.000000000 +0200 +++ new/libzypp-17.8.1/zypp/target/TargetImpl.cc 2018-10-29 15:22:46.000000000 +0100 @@ -1077,7 +1077,7 @@ //load the packages that will trigger the update flag being set { sat::StringQueue q; - filesystem::Pathname needRebootFile = home() / "needreboot"; + filesystem::Pathname needRebootFile = home() / "NeedReboot"; if ( filesystem::PathInfo ( needRebootFile ).isExist() ) { SolvIdentFile file ( needRebootFile ); for ( const auto & idstr : file.data() ) { @@ -1085,7 +1085,7 @@ } } - filesystem::Pathname needRebootDir = home() / "needreboot.d"; + filesystem::Pathname needRebootDir = home() / "NeedReboot.d"; if ( filesystem::PathInfo ( needRebootDir ).isExist() ) { filesystem::DirContent ls; filesystem::readdir( ls, needRebootDir, false ); @@ -1501,7 +1501,7 @@ } else { - if ( citem.identTriggersRebootHint() ) { + if ( citem.identTriggersRebootNeededHint() ) { auto rebootNeededFile = root() / "/var/run/reboot-needed"; if ( filesystem::assert_file( rebootNeededFile ) == EEXIST) filesystem::touch( rebootNeededFile ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/target/hal/HalContext.cc new/libzypp-17.8.1/zypp/target/hal/HalContext.cc --- old/libzypp-17.8.0/zypp/target/hal/HalContext.cc 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.8.1/zypp/target/hal/HalContext.cc 2018-10-12 16:35:39.000000000 +0200 @@ -10,6 +10,7 @@ * * \brief Hardware abstaction layer library wrapper implementation. */ +#include "zypp/base/Gettext.h" #include "zypp/target/hal/HalException.h" ////////////////////////////////////////////////////////////////////// namespace zypp @@ -20,8 +21,21 @@ ////////////////////////////////////////////////////////////////// namespace hal { //////////////////////////////////////////////////////////////// - NoHalException::NoHalException() - : Exception(_("Sorry, but this version of libzypp was built without HAL support.")) + HalException::HalException() + : zypp::Exception(_("Hal Exception")) + {} + HalException::HalException(const std::string &msg_r) + : zypp::Exception(_("Hal Exception")) + , e_name() + , e_msg(msg_r) + {} + HalException::HalException(const std::string &err_name, const std::string &err_msg) + : zypp::Exception(_("Hal Exception")) + , e_name(err_name) + , e_msg(err_msg) + {} + NoHalException::NoHalException() + : Exception(_("Sorry, but this version of libzypp was built without HAL support.")) {} //////////////////////////////////////////////////////////////// } // namespace hal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.0/zypp/target/hal/HalException.h new/libzypp-17.8.1/zypp/target/hal/HalException.h --- old/libzypp-17.8.0/zypp/target/hal/HalException.h 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.8.1/zypp/target/hal/HalException.h 2018-10-12 16:35:39.000000000 +0200 @@ -14,10 +14,8 @@ #define ZYPP_TARGET_HAL_HALEXCEPTION_H #include "zypp/base/Exception.h" -#include "zypp/base/Gettext.h" #include "zypp/base/String.h" - ////////////////////////////////////////////////////////////////////// namespace zypp { //////////////////////////////////////////////////////////////////// @@ -42,29 +40,19 @@ /** Default constructor. * Use \ref ZYPP_THROW to throw exceptions. */ - HalException() - : zypp::Exception(_("Hal Exception")) - {} + HalException(); /** Constructor taking complete hal error message. * This constructor is used to generate custom error * messages, in case, that no DBUS error is avaliable. * Use \ref ZYPP_THROW to throw exceptions. */ - HalException(const std::string &msg_r) - : zypp::Exception(_("Hal Exception")) - , e_name() - , e_msg(msg_r) - {} + HalException(const std::string &msg_r); /** Constructor taking HAL (DBUS) error message components. * Use \ref ZYPP_THROW to throw exceptions. */ - HalException(const std::string &err_name, const std::string &err_msg) - : zypp::Exception(_("Hal Exception")) - , e_name(err_name) - , e_msg(err_msg) - {} + HalException(const std::string &err_name, const std::string &err_msg); /** Destructor. */
