Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2018-11-26 10:16:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp" Mon Nov 26 10:16:24 2018 rev:407 rq:649013 version:17.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2018-11-08 09:42:21.205530561 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new.19453/libzypp.changes 2018-11-26 10:16:27.790002710 +0100 @@ -1,0 +2,7 @@ +Wed Nov 14 11:48:35 CET 2018 - [email protected] + +- Provide needreboot config files in /etc/zypp (fate#326451, fixes #140) +- Need to fix soname due to libsolv ABI changes (bsc#1115341) +- version 17.9.0 (9) + +------------------------------------------------------------------- Old: ---- libzypp-17.8.1.tar.bz2 New: ---- libzypp-17.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.Qycw8p/_old 2018-11-26 10:16:28.646001709 +0100 +++ /var/tmp/diff_new_pack.Qycw8p/_new 2018-11-26 10:16:28.650001704 +0100 @@ -17,7 +17,7 @@ Name: libzypp -Version: 17.8.1 +Version: 17.9.0 Release: 0 Url: https://github.com/openSUSE/libzypp Summary: Package, Patch, Pattern, and Product Management @@ -75,7 +75,7 @@ BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel >= 0.6.35 +BuildRequires: libsolv-devel >= 0.7.1 %if 0%{?suse_version} >= 1100 BuildRequires: libsolv-tools %requires_eq libsolv-tools @@ -232,6 +232,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vars.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vendors.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/needreboot.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/credentials.d mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins @@ -241,7 +242,6 @@ 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 @@ -345,13 +345,13 @@ %dir %{_sysconfdir}/zypp/vars.d %dir %{_sysconfdir}/zypp/vendors.d %dir %{_sysconfdir}/zypp/multiversion.d +%config(noreplace) %{_sysconfdir}/zypp/needreboot +%dir %{_sysconfdir}/zypp/needreboot.d %dir %{_sysconfdir}/zypp/credentials.d %config(noreplace) %{_sysconfdir}/zypp/zypp.conf %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.1.tar.bz2 -> libzypp-17.9.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/CMakeLists.txt new/libzypp-17.9.0/CMakeLists.txt --- old/libzypp-17.8.1/CMakeLists.txt 2018-10-29 15:22:45.000000000 +0100 +++ new/libzypp-17.9.0/CMakeLists.txt 2018-11-14 11:56:53.000000000 +0100 @@ -234,8 +234,8 @@ 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 ) +MESSAGE(STATUS "needreboot will be installed in ${SYSCONFDIR}/zypp/") +INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/needreboot DESTINATION ${SYSCONFDIR}/zypp ) #install systemCheck MESSAGE(STATUS "systemCheck will be installed in ${SYSCONFDIR}/zypp") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/NeedReboot new/libzypp-17.9.0/NeedReboot --- old/libzypp-17.8.1/NeedReboot 2018-10-29 15:22:45.000000000 +0100 +++ new/libzypp-17.9.0/NeedReboot 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -# 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.1/VERSION.cmake new/libzypp-17.9.0/VERSION.cmake --- old/libzypp-17.8.1/VERSION.cmake 2018-10-29 12:22:56.000000000 +0100 +++ new/libzypp-17.9.0/VERSION.cmake 2018-11-14 11:56:53.000000000 +0100 @@ -59,10 +59,10 @@ # See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "17") -SET(LIBZYPP_COMPATMINOR "2") -SET(LIBZYPP_MINOR "8") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_COMPATMINOR "9") +SET(LIBZYPP_MINOR "9") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 17.8.1 (2) +# LAST RELEASED: 17.9.0 (9) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/libzypp.spec.cmake new/libzypp-17.9.0/libzypp.spec.cmake --- old/libzypp-17.8.1/libzypp.spec.cmake 2018-10-29 15:22:45.000000000 +0100 +++ new/libzypp-17.9.0/libzypp.spec.cmake 2018-11-14 15:51:54.000000000 +0100 @@ -75,7 +75,7 @@ BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel >= 0.6.35 +BuildRequires: libsolv-devel >= 0.7.1 %if 0%{?suse_version} >= 1100 BuildRequires: libsolv-tools %requires_eq libsolv-tools @@ -232,6 +232,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vars.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vendors.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/needreboot.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/credentials.d mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins @@ -241,7 +242,6 @@ 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 @@ -345,13 +345,13 @@ %dir %{_sysconfdir}/zypp/vars.d %dir %{_sysconfdir}/zypp/vendors.d %dir %{_sysconfdir}/zypp/multiversion.d +%config(noreplace) %{_sysconfdir}/zypp/needreboot +%dir %{_sysconfdir}/zypp/needreboot.d %dir %{_sysconfdir}/zypp/credentials.d %config(noreplace) %{_sysconfdir}/zypp/zypp.conf %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.1/needreboot new/libzypp-17.9.0/needreboot --- old/libzypp-17.8.1/needreboot 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-17.9.0/needreboot 2018-11-14 11:56:53.000000000 +0100 @@ -0,0 +1,25 @@ +## +## This file contains packages which will trigger the needreboot hint. +## So the user gets informed that the system should be rebooted after +## one of these packages was updated. +## +## This config file is maintained by libzypp unless you manually amend it. +## Additional configuration files can be placed in /etc/zypp/needreboot.d. +## +## Format: Each line must contain either a 'PACKAGENAME' or 'provides:CAPABILITY' +## to include all packages providing a dependency match for 'CAPABILITY'. +## Lines starting with '#' and empty lines are ignored. +## +## Example: +## provides:kernel +## glibc +## +provides:kernel +dbus-1 +glibc +gnutls +kernel-firmware +libopenssl1_0_0 +libopenssl1_1 +systemd +udev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/package/libzypp.changes new/libzypp-17.9.0/package/libzypp.changes --- old/libzypp-17.8.1/package/libzypp.changes 2018-10-29 12:22:56.000000000 +0100 +++ new/libzypp-17.9.0/package/libzypp.changes 2018-11-14 11:56:53.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 14 11:48:35 CET 2018 - [email protected] + +- Provide needreboot config files in /etc/zypp (fate#326451, fixes #140) +- Need to fix soname due to libsolv ABI changes (bsc#1115341) +- version 17.9.0 (9) + +------------------------------------------------------------------- Mon Oct 29 12:20:40 CET 2018 - [email protected] - Adapt to changed type names in libsolv-0.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/po/es.po new/libzypp-17.9.0/po/es.po --- old/libzypp-17.8.1/po/es.po 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.9.0/po/es.po 2018-10-31 21:04:32.000000000 +0100 @@ -17,10 +17,10 @@ "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-08-03 11:09+0200\n" -"PO-Revision-Date: 2018-04-12 23:13+0000\n" -"Last-Translator: Juan Sarria <[email protected]>\n" -"Language-Team: Spanish <https://l10n.opensuse.org/projects/libzypp/master/es/"; -">\n" +"PO-Revision-Date: 2018-10-31 20:02+0000\n" +"Last-Translator: jc sl <[email protected]>\n" +"Language-Team: Spanish " +"<https://l10n.opensuse.org/projects/libzypp/master/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3788,20 +3788,20 @@ #: zypp/RepoInfo.cc:513 #, boost-format msgid "Looking for gpg key ID %1% in cache %2%." -msgstr "" +msgstr "Buscando la llave gpg con identificador ID %1% en la caché %2%." #. translator: %1% is a gpg key ID like 3DBDC284 #. %2% is a repositories name #: zypp/RepoInfo.cc:541 #, boost-format msgid "Looking for gpg key ID %1% in repository %2%." -msgstr "" +msgstr "Buscando la llave gpg con identificador %1% en el repositorio %2%." #. translator: %1% is a repositories name #: zypp/RepoInfo.cc:565 #, boost-format msgid "Repository %1% does not define additional 'gpgkey=' URLs." -msgstr "" +msgstr "El repositorio %1% no define ningún URL 'gpgkey=' adicional." #: zypp/RepoManager.cc:314 #, boost-format @@ -4220,7 +4220,7 @@ #: zypp/media/MediaException.cc:195 #, c-format, boost-format msgid "Downloaded data exceeded the expected filesize '%s' of '%s'." -msgstr "" +msgstr "La descarga de datos ha excedido el tamaño esperado '%s 1' de '%s 2'." #: zypp/media/MediaException.cc:203 #, c-format, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/po/it.po new/libzypp-17.9.0/po/it.po --- old/libzypp-17.8.1/po/it.po 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.9.0/po/it.po 2018-11-11 15:56:29.000000000 +0100 @@ -15,10 +15,10 @@ "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-08-03 11:09+0200\n" -"PO-Revision-Date: 2018-04-12 15:03+0000\n" +"PO-Revision-Date: 2018-11-11 14:55+0000\n" "Last-Translator: Alessio Adamo <[email protected]>\n" -"Language-Team: Italian <https://l10n.opensuse.org/projects/libzypp/master/it/"; -">\n" +"Language-Team: Italian " +"<https://l10n.opensuse.org/projects/libzypp/master/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3781,20 +3781,20 @@ #: zypp/RepoInfo.cc:513 #, boost-format msgid "Looking for gpg key ID %1% in cache %2%." -msgstr "" +msgstr "Ricerca dell'ID %1% della chiave GPG nella cache %2%." #. translator: %1% is a gpg key ID like 3DBDC284 #. %2% is a repositories name #: zypp/RepoInfo.cc:541 #, boost-format msgid "Looking for gpg key ID %1% in repository %2%." -msgstr "" +msgstr "Ricerca dell'ID %1% della chiave GPG nel repository %2%." #. translator: %1% is a repositories name #: zypp/RepoInfo.cc:565 #, boost-format msgid "Repository %1% does not define additional 'gpgkey=' URLs." -msgstr "" +msgstr "Il repository %1% non definisce URL aggiuntivi 'gpgkey=' ." #: zypp/RepoManager.cc:314 #, boost-format @@ -4209,7 +4209,7 @@ #: zypp/media/MediaException.cc:195 #, c-format, boost-format msgid "Downloaded data exceeded the expected filesize '%s' of '%s'." -msgstr "" +msgstr "I dati scaricati eccedono la dimensione attesa '%s' di '%s'." #: zypp/media/MediaException.cc:203 #, c-format, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/zypp/CMakeLists.txt new/libzypp-17.9.0/zypp/CMakeLists.txt --- old/libzypp-17.8.1/zypp/CMakeLists.txt 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.9.0/zypp/CMakeLists.txt 2018-11-12 11:55:49.000000000 +0100 @@ -961,3 +961,12 @@ # install XML schemas FILE( GLOB YUM_SCHEMA_FILES ${LIBZYPP_SOURCE_DIR}/zypp/parser/yum/schema/*.rng ) INSTALL(FILES ${YUM_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/yum" ) + +ADD_CUSTOM_TARGET ( buildmon + COMMAND test ! -x ./buildmon || ./buildmon +) + +ADD_CUSTOM_COMMAND ( + TARGET zypp POST_BUILD + COMMAND test ! -x ./buildmon || ./buildmon +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/zypp/ZConfig.cc new/libzypp-17.9.0/zypp/ZConfig.cc --- old/libzypp-17.8.1/zypp/ZConfig.cc 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.9.0/zypp/ZConfig.cc 2018-11-14 11:56:53.000000000 +0100 @@ -976,6 +976,12 @@ ? (configPath()/"services.d") : _pimpl->cfg_known_services_path ); } + Pathname ZConfig::needrebootFile() const + { return configPath()/"needreboot"; } + + Pathname ZConfig::needrebootPath() const + { return configPath()/"needreboot.d"; } + Pathname ZConfig::varsPath() const { return ( _pimpl->cfg_vars_path.empty() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/zypp/ZConfig.h new/libzypp-17.9.0/zypp/ZConfig.h --- old/libzypp-17.8.1/zypp/ZConfig.h 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.9.0/zypp/ZConfig.h 2018-11-14 11:56:53.000000000 +0100 @@ -207,6 +207,18 @@ Pathname knownServicesPath() const; /** + * Path of the default needreboot config file (configPath()/needreboot). + * \ingroup g_ZC_CONFIGFILES + */ + Pathname needrebootFile() const; + + /** + * Path where the custom needreboot config files are kept (configPath()/needreboot.d). + * \ingroup g_ZC_CONFIGFILES + */ + Pathname needrebootPath() const; + + /** * Path containing custom repo variable definitions (configPath()/vars.d). * \see \ref zypp::repo::RepoVarExpand Repo variable expander * \ingroup g_ZC_CONFIGFILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.8.1/zypp/target/TargetImpl.cc new/libzypp-17.9.0/zypp/target/TargetImpl.cc --- old/libzypp-17.8.1/zypp/target/TargetImpl.cc 2018-10-29 15:22:46.000000000 +0100 +++ new/libzypp-17.9.0/zypp/target/TargetImpl.cc 2018-11-14 11:56:53.000000000 +0100 @@ -1077,15 +1077,33 @@ //load the packages that will trigger the update flag being set { sat::StringQueue q; - filesystem::Pathname needRebootFile = home() / "NeedReboot"; + filesystem::Pathname needRebootFile { Pathname::assertprefix( root(), ZConfig::instance().needrebootFile() ) }; if ( filesystem::PathInfo ( needRebootFile ).isExist() ) { SolvIdentFile file ( needRebootFile ); for ( const auto & idstr : file.data() ) { q.push( idstr.id() ); } - } +#if 1 +#warning Hotfix: temp workaround missing SolvableSpec Parser + // Also consider excluding .rpmnew/.rpmsave/.rpmorig files in needreboot.d + q.push( IdString("kernel-azure").id() ); + q.push( IdString("kernel-azure-base").id() ); + q.push( IdString("kernel-debug").id() ); + q.push( IdString("kernel-debug-base").id() ); + q.push( IdString("kernel-default").id() ); + q.push( IdString("kernel-default-base").id() ); + q.push( IdString("kernel-kvmsmall").id() ); + q.push( IdString("kernel-kvmsmall-base").id() ); + q.push( IdString("kernel-rt").id() ); + q.push( IdString("kernel-rt-base").id() ); + q.push( IdString("kernel-rt_debug").id() ); + q.push( IdString("kernel-rt_debug-base").id() ); + q.push( IdString("kernel-vanilla").id() ); + q.push( IdString("kernel-vanilla-base").id() ); +#endif + } - filesystem::Pathname needRebootDir = home() / "NeedReboot.d"; + filesystem::Pathname needRebootDir { Pathname::assertprefix( root(), ZConfig::instance().needrebootPath() ) }; if ( filesystem::PathInfo ( needRebootDir ).isExist() ) { filesystem::DirContent ls; filesystem::readdir( ls, needRebootDir, false );
