@@ -16,3 +16,12 @@ diff -Naur a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh

    (cd "${RPM_BUILD_ROOT}/usr"

     test ! -d lib/debug || find lib/debug ! -type d

+@@ -467,7 +467,7 @@

+   mv "${LISTFILE}.new" "$LISTFILE"

+   ((++i))

+ done

+-if ((nout > 0)); then

++if ((0 && nout > 0)); then

+   # Now add the right %dir lines to each output list.

+   (cd "${RPM_BUILD_ROOT}"; find usr/lib/debug -type d) |

+   sed 's#^.*$#\\@^/&/@{h;s@^.*$@%dir /&@p;g;}#' |

deleted file mode 100644

@@ -1,11 +0,0 @@

-+++ b/scripts/find-debuginfo.sh	2017-04-23 20:24:52.579860254 +0000

-@@ -314,7 +314,7 @@

-     $strict && exit 2

-   fi

- 

--  [ type gdb-add-index >/dev/null 2>&1 && gdb-add-index "$f" > /dev/null 2>&1

-+  type gdb-add-index >/dev/null 2>&1 && gdb-add-index "$f" > /dev/null 2>&1

- 

-   # A binary already copied into /usr/lib/debug doesn't get stripped,

-   # just has its file names collected and adjusted.

@@ -3,7 +3,7 @@

 Summary:        Package manager

 Name:           rpm

-Version:        4.13.0

+Version:        4.13.0.1

 Release:        1%{?dist}

 License:        GPLv2+

 URL:            http://rpm.org

@@ -11,18 +11,17 @@ Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://github.com/rpm-software-management/rpm/archive/%{name}-%{version}-release.tar.gz

-%define sha1    rpm=67f4c9607460d5f71fc8f6206b40d812090f652f

-Source1:        http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz

-%define sha1    db=fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9

-Source2:        macros

-Source3:        brp-strip-debug-symbols

-Source4:        brp-strip-unneeded

+%define sha1    rpm=2119489397d7e4da19320ef9330ab717ac05587d

+Source1:        macros

+Source2:        brp-strip-debug-symbols

+Source3:        brp-strip-unneeded

 Patch0:         find-debuginfo-do-not-generate-non-existing-build-id.patch

 Patch1:         find-debuginfo-do-not-generate-dir-entries.patch

-Patch2:         find-debuginfo-script-fix.patch

 Requires:       bash

+Requires:       libdb

 Requires:       rpm-libs = %{version}-%{release}

 BuildRequires:  libarchive-devel

+BuildRequires:  libdb-devel

 BuildRequires:  python2

 BuildRequires:  python2-libs

 BuildRequires:  python2-devel

@@ -91,11 +90,11 @@ Python3 rpm.

 %setup -n rpm-%{name}-%{version}-release

 %patch0 -p1

 %patch1 -p1

-%patch2 -p1

-%setup -n rpm-%{name}-%{version}-release  -T -D -a 1

-mv db-5.3.28 db

+

 %build

 sed -i '/define _GNU_SOURCE/a #include "../config.h"' tools/sepdebugcrcfix.c

+sed -i '/^ *include_dirs = /d' python/setup.py.in

+sed -i '/^ *libraries = /d' python/setup.py.in

 ./autogen.sh --noconfigure

 ./configure \

     CPPFLAGS='-I/usr/include/nspr -I/usr/include/nss -DLUA_COMPAT_APIINTCASTS' \

@@ -118,7 +117,8 @@ sed -i '/define _GNU_SOURCE/a #include "../config.h"' tools/sepdebugcrcfix.c

         --enable-python \

         --with-cap \

         --without-lua \

-        --disable-silent-rules

+        --disable-silent-rules \

+        --with-external-db

 make %{?_smp_mflags}

 pushd python

@@ -132,9 +132,9 @@ find %{buildroot} -name '*.la' -delete

 %find_lang %{name}

 # System macros and prefix

 install -dm 755 %{buildroot}%{_sysconfdir}/rpm

-install -vm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/

+install -vm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/

+install -vm755 %{SOURCE2} %{buildroot}%{_libdir}/rpm/

 install -vm755 %{SOURCE3} %{buildroot}%{_libdir}/rpm/

-install -vm755 %{SOURCE4} %{buildroot}%{_libdir}/rpm/

 pushd python

 python2 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}

@@ -263,6 +263,8 @@ rm -rf %{buildroot}

 %{python3_sitelib}/*

 %changelog

+*   Wed May 10 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.13.0.1-1

+-   Update to 4.13.0.1

 *   Fri Apr 21 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.13.0-1

 -   Update to 4.13.0

 *   Wed Apr 19 2017 Alexey Makhalov <amakhalov@vmware.com> 4.11.2-22

@@ -92,6 +92,7 @@ class constants(object):

         "automake",

         "openssl",

         "python2",

+        "libdb",

         "rpm",

         "groff",

         "man-pages",

@@ -185,6 +186,8 @@ class constants(object):

         "python2-libs",

         "python2-devel",

         "libcap",

+        "libdb",

+        "libdb-devel",

         "rpm",

         "rpm-build",

         "rpm-devel",

@@ -287,6 +290,7 @@ class constants(object):

         "iana-etc",

         "yum-metadata-parser",

         "yum",

+        "libdb",

         "rpm-devel",

         "rpm",

         "libxml2",

@@ -82,3 +82,5 @@ x86_64/nss-devel-3.21-1.ph1.x86_64.rpm

 x86_64/libcap-2.25-1.ph1.x86_64.rpm

 x86_64/go-1.4.2-5.ph1.x86_64.rpm

 x86_64/filesystem-1.0-7.ph1.x86_64.rpm

+x86_64/libdb-5.3.28-1.ph2dev.x86_64.rpm

+x86_64/libdb-devel-5.3.28-1.ph2dev.x86_64.rpm