commit 5e9b76edd790b90ae8b06286cf443710427f4402
Author: Jakub Bogusz <[email protected]>
Date: Fri Dec 6 22:55:02 2019 +0100
- updated to 17.18.0
- updated rpm5 patch
libzypp-rpm5.patch | 34 +++++++++++++++++++++++-----------
libzypp.spec | 15 ++++++++-------
2 files changed, 31 insertions(+), 18 deletions(-)
---
diff --git a/libzypp.spec b/libzypp.spec
index 68e4aa5..e499032 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -5,12 +5,13 @@
Summary: Package management library
Summary(pl.UTF-8): Biblioteka do zarządzania pakietami
Name: libzypp
-Version: 15.19.7
+Version: 17.18.0
Release: 1
License: GPL v2+
Group: Libraries
+#Source0Download: https://github.com/openSUSE/libzypp/releases
Source0:
https://github.com/openSUSE/libzypp/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: b1e0e7f1cc7f6078655a3532f8e2f14a
+# Source0-md5: 8bbdddd5d7fb9b123c29dbf4da45ae89
Patch0: %{name}-rpm5.patch
Patch1: %{name}-includes.patch
Patch2: %{name}-link.patch
@@ -21,10 +22,11 @@ BuildRequires: curl-devel
%{?with_apidocs:BuildRequires: doxygen}
BuildRequires: expat-devel >= 1.95
BuildRequires: gettext-tools
+BuildRequires: gpgme-devel
BuildRequires: libproxy-devel
# with helixrepo enabled
BuildRequires: libsolv-devel >= 0.6.8
-BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: libstdc++-devel >= 6:5
BuildRequires: libxml2-devel >= 2.0
BuildRequires: openssl-devel
BuildRequires: rpm-devel >= 5
@@ -49,7 +51,7 @@ Requires: %{name} = %{version}-%{release}
Requires: boost-devel
Requires: curl-devel
Requires: libsolv-devel >= 0.6.8
-Requires: libstdc++-devel
+Requires: libstdc++-devel >= 6:5
Requires: libxml2-devel >= 2.0
Requires: rpm-devel >= 5
@@ -105,15 +107,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc COPYING
%dir %{_sysconfdir}/zypp
+%config(noreplace) %verify(not mtime md5 size) %{_sysconfdir}/zypp/needreboot
%config(noreplace) %verify(not mtime md5 size) %{_sysconfdir}/zypp/systemCheck
%config(noreplace) %verify(not mtime md5 size) %{_sysconfdir}/zypp/zypp.conf
%config(noreplace) %verify(not mtime md5 size) /etc/logrotate.d/zypp-history.lr
%attr(755,root,root) %{_bindir}/zypp-CheckAccessDeleted
%attr(755,root,root) %{_bindir}/zypp-NameReqPrv
%attr(755,root,root) %{_libdir}/libzypp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libzypp.so.1519
-%dir %{_libdir}/zypp
-%attr(755,root,root) %{_libdir}/zypp/notify-message
+%attr(755,root,root) %ghost %{_libdir}/libzypp.so.1712
%{_datadir}/zypp
%{_mandir}/man1/zypp-CheckAccessDeleted.1*
%{_mandir}/man1/zypp-NameReqPrv.1*
diff --git a/libzypp-rpm5.patch b/libzypp-rpm5.patch
index 788e1f5..a0c20ad 100644
--- a/libzypp-rpm5.patch
+++ b/libzypp-rpm5.patch
@@ -9,6 +9,18 @@
{}
bool empty() const
+--- libzypp-14.36.0/zypp/target/rpm/BinHeader.cc.orig 2015-02-09
16:07:05.000000000 +0100
++++ libzypp-14.36.0/zypp/target/rpm/BinHeader.cc 2015-02-17
20:28:45.204574339 +0100
+@@ -10,6 +10,9 @@
+ *
+ */
+ #include "librpm.h"
++#ifdef _RPM_5
++#include <rpm46compat.h>
++#endif
+ extern "C"
+ {
+ #ifdef _RPM_5
--- libzypp-14.36.0/zypp/target/rpm/librpm.h.orig 2015-02-09
16:07:05.000000000 +0100
+++ libzypp-14.36.0/zypp/target/rpm/librpm.h 2015-02-18 18:24:23.831261616
+0100
@@ -15,6 +15,8 @@
@@ -40,14 +52,14 @@
::rpmdbAppendIterator( _mi, (const unsigned *)&off_r, 1 );
#else
::rpmdbAppendIterator( _mi, &off_r, 1 );
---- libzypp-15.19.7/zypp/target/rpm/RpmDb.cc.orig 2015-11-16
12:27:16.000000000 +0100
-+++ libzypp-15.19.7/zypp/target/rpm/RpmDb.cc 2015-11-30 18:09:50.110957451
+0100
-@@ -1516,7 +1516,7 @@
-
- rpmQVKArguments_s qva;
- memset( &qva, 0, sizeof(rpmQVKArguments_s) );
-- qva.qva_flags = (VERIFY_DIGEST|VERIFY_SIGNATURE);
-+ qva.qva_flags = rpmQueryFlags(VERIFY_DIGEST|VERIFY_SIGNATURE);
-
- RpmlogCapture vresult;
- int res = ::rpmVerifySignatures( &qva, ts, fd, path_r.basename().c_str() );
+--- libzypp-17.18.0/zypp/target/rpm/RpmDb.cc.orig 2019-12-06
20:32:29.739774140 +0100
++++ libzypp-17.18.0/zypp/target/rpm/RpmDb.cc 2019-12-06 20:33:49.202676985
+0100
+@@ -1562,7 +1562,7 @@
+ #ifdef HAVE_NO_RPMTSSETVFYFLAGS
+ // Legacy: In rpm >= 4.15 qva_flags symbols don't exist
+ // and qva_flags is not used in signature checking at all.
+- qva.qva_flags = (VERIFY_DIGEST|VERIFY_SIGNATURE);
++ qva.qva_flags = rpmQueryFlags(VERIFY_DIGEST|VERIFY_SIGNATURE);
+ #else
+ ::rpmtsSetVfyFlags( ts, RPMVSF_DEFAULT );
+ #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libzypp.git/commitdiff/5e9b76edd790b90ae8b06286cf443710427f4402
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
