From c8d6762363c098f632ffe9c743a9177ef9d7a2d37e0966bfefcc981a029d934d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 21 Jul 2022 14:20:54 +0000 Subject: [PATCH] up OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=613 --- 0001-fix-minimize_writes.patch | 31 ------------------------------- debugedit-5.0.tar.xz | 3 --- python-rpm.changes | 5 +++++ python-rpm.spec | 2 +- rpm.changes | 6 ++++-- singlefilemode.diff | 10 ---------- 6 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 0001-fix-minimize_writes.patch delete mode 100644 debugedit-5.0.tar.xz delete mode 100644 singlefilemode.diff diff --git a/0001-fix-minimize_writes.patch b/0001-fix-minimize_writes.patch deleted file mode 100644 index e0d59c9..0000000 --- a/0001-fix-minimize_writes.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 03f146e955e099c24f7a49eff461645e1c0a0fd7 -Author: Panu Matilainen -Date: Thu Jan 13 11:25:30 2022 +0200 - - Fix minimize_writes not minimizing writes since 4.15 regression - - Commit 13f70e3710b2df49a923cc6450ff4a8f86e65666 caused minimize_writes - to actually not minimize anything since fsmVerify() only "verifies" - the thing does NOT exist anymore when it exist. Sigh. - - FA_TOUCH needs different kind of verification, stat the file instead - to see if it needs creating afterall. This is all soooo broken... - - Fixes: #1881 - ---- lib/fsm.c.orig -+++ lib/fsm.c -@@ -945,7 +945,12 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, - } - /* Assume file does't exist when tmp suffix is in use */ - if (!fp->suffix) { -- rc = fsmVerify(fp->fpath, fi); -+ if (fp->action == FA_TOUCH) { -+ struct stat sb; -+ rc = fsmStat(fp->fpath, 1, &sb); -+ } else { -+ rc = fsmVerify(fp->fpath, fi); -+ } - } else { - rc = RPMERR_ENOENT; - } diff --git a/debugedit-5.0.tar.xz b/debugedit-5.0.tar.xz deleted file mode 100644 index 287e2f9..0000000 --- a/debugedit-5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9ecd7d350bebae1f178ce6776ca19a648b6fe8fa22f5b3044b38d7899aa553e -size 164820 diff --git a/python-rpm.changes b/python-rpm.changes index 401639c..ce414dc 100644 --- a/python-rpm.changes +++ b/python-rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------ +Thu Jul 21 16:11:22 CEST 2022 - mls@suse.de + +- update to rpm-4.17.1 + ------------------------------------------------------------------- Thu Sep 23 20:57:45 CEST 2021 - mls@suse.de diff --git a/python-rpm.spec b/python-rpm.spec index fca1f42..254d8d3 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -21,7 +21,7 @@ %global with_python 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-rpm -Version: 4.17.0 +Version: 4.17.1 Release: 0 Summary: Python Bindings for Manipulating RPM Packages License: GPL-2.0-or-later diff --git a/rpm.changes b/rpm.changes index 213eacb..c8be33e 100644 --- a/rpm.changes +++ b/rpm.changes @@ -18,9 +18,11 @@ Mon Jun 27 11:01:54 UTC 2022 - Ludwig Nussel - remove obsolete RPM-HOWTO from 1999 (removed RPM-HOWTO.tar.bz2) - move debugedit to separate package (Removed debuginfo-mono.patch, debuglink.diff, debugsubpkg.diff, - finddebuginfo-absolute-links.diff, finddebuginfo.diff) + finddebuginfo-absolute-links.diff, finddebuginfo.diff, + singlefilemode.diff) + - move python-rpm-packaging to separate package - (Removed python-rpm-packaging.diff, python-rpm-packaging.tar.bz2 + (Removed python-rpm-packaging.diff, python-rpm-packaging.tar.bz2) ------------------------------------------------------------------- Tue May 31 19:58:07 UTC 2022 - Dirk Müller diff --git a/singlefilemode.diff b/singlefilemode.diff deleted file mode 100644 index b1b0631..0000000 --- a/singlefilemode.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- scripts/find-debuginfo.in.orig 2021-09-24 09:10:06.477724685 +0000 -+++ scripts/find-debuginfo.in 2021-09-24 09:10:26.557680705 +0000 -@@ -168,7 +168,6 @@ while [ $# -gt 0 ]; do - ;; - --dwz-single-file-mode) - dwz_single_file_mode=true -- shift - ;; - --build-id-seed) - build_id_seed=$2