Commit 0df8b3ac authored by Andrew Branson's avatar Andrew Branson

[update] Update packaging for libzypp 16.2.2. Contributes JB#36070

Extracts residual changes from old subtree into a new patch.
parent 5211700e
......@@ -6,14 +6,19 @@ Subject: [PATCH] zypp/PublicKey.cc: Use GPG_BINARY from KeyRing.cc
On systems where "gpg" is not available, checking the public key
would fail. Use GPG_BINARY in both PublicKey.cc and KeyRing.cc,
and define it in a single place only (ExternalProgram.h).
The original patch was partially integrated in upstream
commit 092cded378742fcbb0761cc470da863cb32ed537, but only as a duplicated
define in KeyRing and PublicKey. This patch now just moves the define to
ExternalProgram.h
---
zypp/ExternalProgram.h | 2 ++
zypp/KeyRing.cc | 2 --
zypp/PublicKey.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
zypp/KeyRing.cc | 3 ---
zypp/PublicKey.cc | 3 ---
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/zypp/ExternalProgram.h b/zypp/ExternalProgram.h
index bc62a4c..46e8145 100644
index f3fc850..99a3143 100644
--- a/zypp/ExternalProgram.h
+++ b/zypp/ExternalProgram.h
@@ -22,6 +22,8 @@
......@@ -26,31 +31,34 @@ index bc62a4c..46e8145 100644
/**
diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc
index 13cae3d..a4dc447 100644
index d6b8246..826ce4c 100644
--- a/zypp/KeyRing.cc
+++ b/zypp/KeyRing.cc
@@ -37,8 +37,6 @@ using std::endl;
@@ -35,9 +35,6 @@ using std::endl;
#undef ZYPP_BASE_LOGGER_LOGGROUP
#define ZYPP_BASE_LOGGER_LOGGROUP "zypp::KeyRing"
-/** \todo Fix duplicate define in PublicKey/KeyRing */
-#define GPG_BINARY "/usr/bin/gpg2"
-
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
diff --git a/zypp/PublicKey.cc b/zypp/PublicKey.cc
index 4d3d773..52d9d7a 100644
index fa17b79..fdbc95e 100644
--- a/zypp/PublicKey.cc
+++ b/zypp/PublicKey.cc
@@ -349,7 +349,7 @@ namespace zypp
static filesystem::TmpDir dir;
const char* argv[] =
{
- "gpg",
+ GPG_BINARY,
"-v",
"--no-default-keyring",
"--fixed-list-mode",
@@ -28,9 +28,6 @@
#include <ctime>
-/** \todo Fix duplicate define in PublicKey/KeyRing */
-#define GPG_BINARY "/usr/bin/gpg2"
-
using std::endl;
///////////////////////////////////////////////////////////////////
--
2.1.4
1.8.3-rc3
diff --git a/zypp.conf b/zypp.conf
index dfe7f64..5292843 100644
--- a/zypp.conf
+++ b/zypp.conf
@@ -199,7 +199,7 @@
##
## This option has no effect unless download.use_deltarpm is set true.
##
-# download.use_deltarpm.always = false
+download.use_deltarpm.always = true
##
## Hint which media to prefer when installing packages (download vs. CD).
@@ -427,6 +427,16 @@
# solver.checkSystemFile = /etc/zypp/systemCheck
##
+## This directory can contain files that contain requirements/conflicts
+## which fulfill the needs of a running system (see checkSystemFile).
+##
+## Files are read in alphabetical order.
+##
+## Default value: {configdir}/systemCheck.d
+##
+# solver.checkSystemFileDir = /etc/zypp/systemCheck.d
+
+##
## When committing a dist upgrade (e.g. 'zypper dup') a solver testcase
## is written to /var/log/updateTestcase-<date>. It is needed in bugreports.
## This option returns the number of testcases to keep on the system. Old
@@ -595,7 +505,7 @@ multiversion.kernels = latest,latest-1,running
## Valid values: boolean
## Default value: no
##
-# rpm.install.excludedocs = no
+rpm.install.excludedocs = yes
##
## Location of history log file.
......@@ -2,16 +2,17 @@ Name: libzypp
License: GPLv2+
Group: System/Packages
Summary: Package, Patch, Pattern, and Product Management
Version: 14.35.0
Version: 16.2.2
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
Patch0: 0001-zypp-PublicKey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch
Patch1: 0002-Revert-Collect-and-execute-posttrans-scripts-delayed.patch
Patch1: 0002-Diffs-14.35.0-10.patch
BuildRequires: cmake
BuildRequires: openssl-devel
BuildRequires: libudev-devel
BuildRequires: boost-devel >= 1.49.0
# Need boost > 1.53 for string_ref utility
BuildRequires: boost-devel >= 1.53.0
BuildRequires: doxygen
BuildRequires: gcc-c++ >= 4.6
BuildRequires: gettext-devel
......@@ -51,7 +52,7 @@ Requires: glibc-devel
Requires: zlib-devel
Requires: bzip2
Requires: popt-devel
Requires: boost-devel >= 1.49.0
Requires: boost-devel >= 1.60.0
Requires: libstdc++-devel
Requires: libudev-devel
Requires: cmake
......@@ -74,7 +75,7 @@ Authors:
Ladislav Slezak <lslezak@suse.cz>
%prep
%setup -q -n %{name}-%{version}/%{name}
%setup -q -n %{name}-%{version}/upstream
%patch0 -p1
%patch1 -p1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment