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 )
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)
#=======
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
%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
--- /dev/null
+# This file contains the default list of packages
+# which will trigger the needreboot 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
-------------------------------------------------------------------
+Mon Oct 29 12:20:40 CET 2018 - ma@suse.de
+
+- 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 - ma@suse.de
- Add infrastructure to flag specific packages to trigger a
"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 <zhx@cnzhx.net>\n"
"Language-Team: Chinese (China) "
"<https://l10n.opensuse.org/projects/libzypp/master/zh_CN/>\n"
#: 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
#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"
#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"
#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
{ /////////////////////////////////////////////////////////////////
#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"
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;
struct _Solvable;
struct _Solver;
struct _Transaction;
+#endif
}
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
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
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
///////////////////////////////////////////////////////////////////
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 );
*
* \brief Hardware abstaction layer library wrapper implementation.
*/
+#include "zypp/base/Gettext.h"
#include "zypp/target/hal/HalException.h"
//////////////////////////////////////////////////////////////////////
namespace zypp
//////////////////////////////////////////////////////////////////
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
#define ZYPP_TARGET_HAL_HALEXCEPTION_H
#include "zypp/base/Exception.h"
-#include "zypp/base/Gettext.h"
#include "zypp/base/String.h"
-
//////////////////////////////////////////////////////////////////////
namespace zypp
{ ////////////////////////////////////////////////////////////////////
/** 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.
*/