From d2e720fc1e8cfeb26aba980f3e1af699a0720a03022ae3331e83377d45cd462e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Tue, 19 Nov 2019 10:10:28 +0000
Subject: [PATCH] - update to rpm-4.15.1

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=513
---
 fix_lua_cflags.diff | 12 ------------
 python-rpm.spec     |  2 +-
 rpm-4.15.0.tar.bz2  |  3 ---
 rpm-4.15.1.tar.bz2  |  3 +++
 rpm.changes         |  8 ++++++++
 rpm.spec            |  4 +---
 6 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 fix_lua_cflags.diff
 delete mode 100644 rpm-4.15.0.tar.bz2
 create mode 100644 rpm-4.15.1.tar.bz2

diff --git a/fix_lua_cflags.diff b/fix_lua_cflags.diff
deleted file mode 100644
index 23a50f3..0000000
--- a/fix_lua_cflags.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./build/Makefile.am.orig	2019-10-02 13:12:00.031823903 +0000
-+++ ./build/Makefile.am	2019-10-02 13:13:09.743668564 +0000
-@@ -10,6 +10,9 @@ AM_CPPFLAGS += @WITH_NSS_INCLUDE@
- AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@
- AM_CPPFLAGS += @WITH_POPT_INCLUDE@
- AM_CPPFLAGS += -I$(top_srcdir)/misc
-+if WITH_LUA
-+AM_CPPFLAGS += @LUA_CFLAGS@
-+endif
- 
- usrlibdir = $(libdir)
- usrlib_LTLIBRARIES = librpmbuild.la
diff --git a/python-rpm.spec b/python-rpm.spec
index 30adad3..c4f8c79 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.15.0
+Version:        4.15.1
 Release:        0
 Summary:        Python Bindings for Manipulating RPM Packages
 License:        GPL-2.0-or-later
diff --git a/rpm-4.15.0.tar.bz2 b/rpm-4.15.0.tar.bz2
deleted file mode 100644
index 04503ed..0000000
--- a/rpm-4.15.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e06723b13591e57c99ebe2006fb8daddc4cf72efb366a64a34673ba5f61c201
-size 4205632
diff --git a/rpm-4.15.1.tar.bz2 b/rpm-4.15.1.tar.bz2
new file mode 100644
index 0000000..a11d4ba
--- /dev/null
+++ b/rpm-4.15.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
+size 4243893
diff --git a/rpm.changes b/rpm.changes
index 0c1c169..b2c63d9 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 19 11:09:08 CET 2019 - mls@suse.de
+
+- update to rpm-4.15.1
+  * bugfix release
+- dropped patches:
+  * fix_lua_cflags.diff
+
 -------------------------------------------------------------------
 Tue Nov  5 16:25:53 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
 
diff --git a/rpm.spec b/rpm.spec
index 304d027..8e4862f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -57,7 +57,7 @@ Requires:       /usr/bin/awk
 Summary:        The RPM Package Manager
 License:        GPL-2.0-or-later
 Group:          System/Packages
-Version:        4.15.0
+Version:        4.15.1
 Release:        0
 URL:            https://rpm.org/
 #Git-Clone:     https://github.com/rpm-software-management/rpm
@@ -127,7 +127,6 @@ Patch102:       emptymanifest.diff
 Patch103:       find-lang-qt-qm.patch
 Patch109:       pythondistdeps.diff
 Patch117:       findsupplements.diff
-Patch118:       fix_lua_cflags.diff
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
@@ -239,7 +238,6 @@ rm -f rpmdb/db.h
 %patch                   -P 93 -P 94                         -P 99
 %patch -P 100        -P 102 -P 103                            
 %patch -P 109                                           -P 117
-%patch -P 118
 
 %ifarch aarch64 ppc64le riscv64
 %patch6464