@@ -1,7 +1,7 @@

 Summary:	The Berkley DB database library for C

 Name:		libdb

 Version:	5.3.28

-Release:	3%{?dist}

+Release:	2%{?dist}

 License:	BSD and LGPLv2 and Sleepycat

 URL:		https://oss.oracle.com/berkeley-db.html

 Source0:	http://download.oracle.com/berkeley-db/db-%{version}.tar.gz

@@ -13,12 +13,6 @@ Obsoletes:      db

 %description

 The Berkeley DB package contains libraries used by many other applications for database related functions.

-%package	utils

-Summary:	Header and development files

-Requires:	%{name} = %{version}

-%description	utils

-db dump utility

-

 %package	devel

 Summary:	Header and development files

 Requires:	%{name} = %{version}

@@ -62,10 +56,6 @@ rm -rf %{buildroot}

 %{_libdir}/*.so

 %{_datadir}/licenses/*

-%files utils

-%defattr(-,root,root)

-%{_bindir}/db_dump

-

 %files docs

 %defattr(-,root,root)

 %{_docdir}/%{name}-%{version}/*

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

 %{_includedir}/*

 %changelog

-*   Wed Jan 17 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.3.28-3

--   add libdb-utils for db_dump

 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 5.3.28-2

 -   Aarch64 support

 *	Thu Oct 27 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.3.28-1

@@ -89,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT

 *   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.1-4

 -   BuildRequired attr-devel.

 *   Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.1-3

--   Use setup instead of autosetup

+-   Use %setup instead of %autosetup

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2015.1-2

 -   GA - Bump release of all rpms

 *   Mon Nov 24 2014 Divya Thaluru <dthaluru@vmware.com> 2014.2-1

@@ -1,7 +1,7 @@

 Summary:        Simple package manager built on top of hawkey and librepo

 Name:           libhif

 Version:        0.2.3

-Release:        2%{?dist}

+Release:        1%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/hughsie/libhif

 Source0:        http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz

@@ -23,7 +23,6 @@ BuildRequires:  python2-libs

 BuildRequires:  python2

 BuildRequires:  gobject-introspection-python

 BuildRequires:  openssl-devel

-BuildRequires:  lmdb-devel

 Requires:       openssl

 Requires:       librepo

@@ -84,8 +83,6 @@ make check

 %{_datadir}/gir-1.0/*.gir

 %changelog

-*   Sun Mar 04 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.2.3-2

--   added build requires lmdb-devel

 *   Thu Aug 19 2017 Chang Lee <changlee@vmware.com> 0.2.3-1

 -   Updated to 0.2.3

 -   Disabled GLib-GObject-CRITICAL tests due to Segmentation fault in all tests

deleted file mode 100644

@@ -1,490 +0,0 @@

-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 605ab76..7fad325 100644

-+++ b/CMakeLists.txt

-@@ -12,6 +12,7 @@ OPTION (ENABLE_TCL "Build the Tcl bindings?" OFF)

- 

- OPTION (USE_VENDORDIRS "Install the bindings in vendor directories?" OFF)

- 

-+OPTION (ENABLE_RPMDB_LMDB "Build with rpm db as lmdb?" OFF)

- OPTION (ENABLE_RPMDB "Build with rpm database support?" OFF)

- OPTION (ENABLE_RPMPKG "Build with rpm package support?" OFF)

- OPTION (ENABLE_PUBKEY "Build with pubkey support?" OFF)

-@@ -83,6 +84,17 @@ INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake)

- 

- SET (have_system x)

- 

-+IF (PHOTON)

-+MESSAGE(STATUS "Building for Photon")

-+ADD_DEFINITIONS (-DPHOTON)

-+SET (RPM5 ON)

-+SET (ENABLE_RPMDB ON)

-+SET (ENABLE_RPMMD ON)

-+SET (ENABLE_RPMDB_LMDB ON)

-+SET (ENABLE_COMPLEX_DEPS ON)

-+SET (have_system ${have_system}x)

-+ENDIF (PHOTON)

-+

- IF (FEDORA)

- MESSAGE(STATUS "Building for Fedora")

- ADD_DEFINITIONS (-DFEDORA)

-@@ -220,17 +232,25 @@ IF (ENABLE_RPMDB)

-     ENDIF (RPMMISC_LIBRARY)

-   ENDIF (RPM5)

- 

--  # check if rpm contains a bundled berkeley db

--  CHECK_INCLUDE_FILE(rpm/db.h HAVE_RPM_DB_H)

--  IF (NOT HAVE_RPM_DB_H)

--    FIND_LIBRARY (DB_LIBRARY NAMES db)

-+  IF (NOT ENABLE_RPMDB_LMDB)

-+    # check if rpm contains a bundled berkeley db

-+    CHECK_INCLUDE_FILE(rpm/db.h HAVE_RPM_DB_H)

-+    IF (NOT HAVE_RPM_DB_H)

-+      FIND_LIBRARY (DB_LIBRARY NAMES db)

-+      IF (DB_LIBRARY)

-+        SET (RPMDB_LIBRARY ${DB_LIBRARY} ${RPMDB_LIBRARY})

-+      ENDIF (DB_LIBRARY)

-+      IF (DB_INCLUDE_DIR)

-+        INCLUDE_DIRECTORIES (${DB_INCLUDE_DIR})

-+      ENDIF (DB_INCLUDE_DIR)

-+    ENDIF (NOT HAVE_RPM_DB_H)

-+  ELSE (NOT ENABLE_RPMDB_LMDB)

-+    FIND_LIBRARY (DB_LIBRARY NAMES lmdb)

-     IF (DB_LIBRARY)

-       SET (RPMDB_LIBRARY ${DB_LIBRARY} ${RPMDB_LIBRARY})

-     ENDIF (DB_LIBRARY)

--    IF (DB_INCLUDE_DIR)

--      INCLUDE_DIRECTORIES (${DB_INCLUDE_DIR})

--    ENDIF (DB_INCLUDE_DIR)

--  ENDIF (NOT HAVE_RPM_DB_H)

-+  ENDIF (NOT ENABLE_RPMDB_LMDB)

-+

-   INCLUDE (CheckLibraryExists)

-   CHECK_LIBRARY_EXISTS(rpmio pgpDigGetParams "" HAVE_PGPDIGGETPARAMS)

- ENDIF (ENABLE_RPMDB)

-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt

-index 703796c..d56184f 100644

-+++ b/examples/CMakeLists.txt

-@@ -1,5 +1,5 @@

--IF (SUSE OR FEDORA OR DEBIAN OR MANDRIVA OR MAGEIA)

-+IF (PHOTON OR SUSE OR FEDORA OR DEBIAN OR MANDRIVA OR MAGEIA)

- 

- ADD_SUBDIRECTORY (solv)

- 

--ENDIF (SUSE OR FEDORA OR DEBIAN OR MANDRIVA OR MAGEIA)

-+ENDIF (PHOTON OR SUSE OR FEDORA OR DEBIAN OR MANDRIVA OR MAGEIA)

-diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt

-index b8917a2..5d75c3f 100644

-+++ b/ext/CMakeLists.txt

-@@ -11,6 +11,13 @@ IF (ENABLE_RPMDB OR ENABLE_RPMPKG)

-         pool_fileconflicts.h repo_rpmdb.h)

- ENDIF (ENABLE_RPMDB OR ENABLE_RPMPKG)

- 

-+IF (ENABLE_RPMDB_LMDB)

-+    SET (libsolvext_SRCS ${libsolvext_SRCS}

-+        db_lmdb.c)

-+    SET (libsolvext_HEADERS ${libsolvext_HEADERS}

-+        db_lmdb.h)

-+ENDIF (ENABLE_RPMDB_LMDB)

-+

- IF (ENABLE_PUBKEY)

-     SET (libsolvext_SRCS ${libsolvext_SRCS}

- 	repo_pubkey.c)

-diff --git a/ext/db_lmdb.c b/ext/db_lmdb.c

-new file mode 100644

-index 0000000..c3941b0

-+++ b/ext/db_lmdb.c

-@@ -0,0 +1,258 @@

-+/*

-+ * Copyright (c) 2007-2012, Novell Inc.

-+ *

-+ * This program is licensed under the BSD license, read LICENSE.BSD

-+ * for further information

-+ */

-+

-+/*

-+ * db_lmdb

-+ *

-+ * bridge for db to lmdb calls

-+ *

-+ */

-+

-+#include <sys/types.h>

-+#include <sys/stat.h>

-+#include <limits.h>

-+#include <fcntl.h>

-+#include <stdio.h>

-+#include <stdlib.h>

-+#include <string.h>

-+#include <unistd.h>

-+#include <assert.h>

-+#include <stdint.h>

-+#include <errno.h>

-+

-+#include "db_lmdb.h"

-+#include "util.h"

-+

-+int db_env_open(struct _DB_ENV_ *dbenv, const char *dbpath, u_int32_t flags, int naccess)

-+{

-+  int err = 0;

-+

-+  err = mdb_env_open(dbenv->env, dbpath, 0, naccess);

-+  bail_on_error(err);

-+

-+error:

-+  return err;  

-+}

-+

-+int db_env_close(struct _DB_ENV_ *dbenv, u_int32_t flags)

-+{

-+  int err = 0;

-+

-+  if(dbenv && dbenv->env)

-+    mdb_env_close(dbenv->env);

-+

-+  return err;

-+}

-+

-+int db_env_get_open_flags(struct _DB_ENV_ *dbenv, u_int32_t *flags)

-+{

-+  *flags = 0;

-+  return 0;

-+}

-+

-+int db_env_create (DB_ENV **dbenvp, u_int32_t flags)

-+{

-+  DB_ENV *dbenv = NULL;

-+  MDB_env *mdbenv = NULL;

-+  int err = 0;

-+

-+  dbenv = solv_malloc(sizeof(DB_ENV));

-+  if(!dbenv)

-+    err = ENOMEM;

-+  bail_on_error(err);

-+

-+  err = mdb_env_create(&mdbenv);

-+  bail_on_error(err);

-+

-+  err = mdb_env_set_maxreaders(mdbenv, 16);

-+  bail_on_error(err);

-+

-+  err = mdb_env_set_maxdbs(mdbenv, 32);

-+  bail_on_error(err);

-+

-+  err = mdb_env_set_mapsize(mdbenv, 50*1024*1024);

-+  bail_on_error(err);

-+

-+  dbenv->env = mdbenv;

-+  dbenv->open = db_env_open;

-+  dbenv->close = db_env_close;

-+  dbenv->get_open_flags = db_env_get_open_flags;

-+

-+  *dbenvp = dbenv;

-+cleanup:

-+  return err;

-+

-+error:

-+  if(mdbenv)

-+    mdb_env_close(mdbenv);

-+  solv_free(dbenv);

-+  goto cleanup;

-+}

-+

-+//db

-+int db_close(struct _DB_ *db, u_int32_t flags)

-+{

-+  return 0;

-+}

-+

-+int dbc_close(struct _DBC_ *dbc)

-+{

-+/*

-+  if(dbc->txn)

-+  {

-+    if(dbc->txn->txn)

-+      mdb_txn_abort(dbc->txn->txn);

-+    dbc->txn->txn = NULL;

-+    solv_free(dbc->txn);

-+  }

-+  dbc->txn = NULL;

-+*/

-+  return 0;

-+}

-+

-+int dbc_c_close(struct _DBC_ *dbc)

-+{

-+  if(dbc->cursor)

-+    mdb_cursor_close(dbc->cursor);

-+  dbc->cursor = NULL;

-+  return 0;

-+}

-+

-+int dbc_c_get(struct _DBC_ *dbc, struct _DBT_ *key, struct _DBT_ *value, u_int32_t flags)

-+{

-+  int err = 0;

-+  u_int32_t flagsin = flags == DB_SET ? MDB_SET : MDB_NEXT;

-+  MDB_val mkey, mval;

-+

-+  if(flagsin == MDB_SET)

-+  {

-+    mkey.mv_size = key->size;

-+    mkey.mv_data = key->data;

-+  }

-+

-+  err = mdb_cursor_get(dbc->cursor, &mkey, &mval, flagsin);

-+  bail_on_error(err);

-+

-+  if(flagsin == MDB_NEXT)

-+  {

-+    key->size = mkey.mv_size;

-+    key->data = mkey.mv_data;

-+  }

-+  value->size = mval.mv_size;

-+  value->data = mval.mv_data;

-+

-+cleanup:

-+  return err;

-+error:

-+  goto cleanup;

-+}

-+

-+int db_cursor(struct _DB_ *db, struct _DB_TXN_ *txn,

-+              struct _DBC_ **dbcp, u_int32_t flags)

-+{

-+  int err = 0;

-+  DBC *dbc = NULL;

-+

-+  DB_TXN *txncurrent = txn ? txn : db->txn;

-+

-+  if(!txncurrent || !txncurrent->txn)

-+    err = EINVAL;

-+  bail_on_error(err);

-+

-+  dbc = solv_malloc(sizeof(DBC));

-+  if(!dbc)

-+    err = ENOMEM;    

-+  bail_on_error(err);

-+

-+  err = mdb_cursor_open(txncurrent->txn, db->db, &dbc->cursor);

-+  bail_on_error(err);

-+

-+  dbc->close = dbc_close;

-+  dbc->c_close = dbc_c_close;

-+  dbc->c_get = dbc_c_get;

-+

-+  *dbcp = dbc;

-+cleanup:

-+  return err;

-+error:

-+  solv_free(dbc);

-+  goto cleanup;

-+}

-+ 

-+int db_get(struct _DB_ *db, struct _DB_TXN_ *txn,

-+           struct _DBT_ *key, struct _DBT_ *value, u_int32_t flags)

-+{

-+  return 0;

-+}

-+

-+int db_open(struct _DB_ *db, struct _DB_TXN_ *txn,

-+            const char *file, const char *database,

-+            DBTYPE dbtype, u_int32_t flags, int mode)

-+{

-+  int err = 0;

-+  DB_TXN *txnp = NULL;

-+  MDB_dbi dbi = -1;

-+  DB_TXN *txncurrent = txn;

-+

-+  if(!txn)

-+  {

-+    u_int32_t txnflags = flags & DB_RDONLY ? MDB_RDONLY : 0;

-+    txnp = solv_malloc(sizeof(DB_TXN));

-+    if(!txnp)

-+      err = ENOMEM;    

-+    bail_on_error(err);

-+

-+    err = mdb_txn_begin(db->env, NULL, txnflags, &txnp->txn);

-+    bail_on_error(err);

-+

-+    txncurrent = txnp;

-+  }

-+

-+  err = mdb_dbi_open(txncurrent->txn, file, 0, &dbi);

-+  bail_on_error(err);

-+  

-+  db->txn = txnp;

-+  db->db = dbi;

-+

-+cleanup:

-+  return err;

-+error:

-+  solv_free(txnp);

-+  goto cleanup;

-+}

-+

-+int db_get_byteswapped(struct _DB_ *db, int *byteswapped)

-+{

-+  *byteswapped = 0;

-+  return 0;

-+}

-+

-+int db_create (DB **db, DB_ENV *dbenv, u_int32_t flags)

-+{

-+  int err = 0;

-+  DB *dbp = NULL;

-+

-+  dbp = solv_malloc(sizeof(DB));

-+  if(!dbp)

-+    err = ENOMEM;

-+  bail_on_error(err);

-+

-+

-+  dbp->env = dbenv->env;

-+  dbp->close = db_close;

-+  dbp->cursor = db_cursor;

-+  dbp->get = db_get;

-+  dbp->get_byteswapped = db_get_byteswapped;

-+  dbp->open = db_open;

-+  *db = dbp;

-+

-+cleanup:

-+  return err;

-+error:

-+  solv_free(dbp);

-+  goto cleanup;

-+}

-diff --git a/ext/db_lmdb.h b/ext/db_lmdb.h

-new file mode 100644

-index 0000000..4eb197d

-+++ b/ext/db_lmdb.h

-@@ -0,0 +1,83 @@

-+/*

-+ * Copyright (c) 2007-2008, Novell Inc.

-+ *

-+ * This program is licensed under the BSD license, read LICENSE.BSD

-+ * for further information

-+ */

-+

-+#ifndef RPM_LMDB_H

-+#define RPM_LMDB_H

-+

-+#include <lmdb.h>

-+

-+typedef enum

-+{

-+  DB_UNKNOWN=5

-+} DBTYPE;

-+

-+typedef struct _DB_ENV_

-+{

-+  MDB_env *env;

-+  int  (*get_open_flags) (struct _DB_ENV_ *, u_int32_t *);

-+  int  (*open) (struct _DB_ENV_ *, const char *, u_int32_t, int);

-+  int  (*close) (struct _DB_ENV_ *, u_int32_t);

-+}DB_ENV;

-+

-+typedef struct _DB_TXN_

-+{

-+  MDB_txn *txn;

-+}DB_TXN;

-+

-+typedef struct _DBT_

-+{

-+  void *data;

-+  u_int32_t size;

-+}DBT;

-+

-+typedef struct _DBC_

-+{

-+  MDB_cursor *cursor;

-+  int (*close) (struct _DBC_ *);

-+  int (*c_close) (struct _DBC_ *);

-+  int (*c_get) (struct _DBC_ *, struct _DBT_ *, struct _DBT_ *, u_int32_t);

-+}DBC;

-+

-+typedef struct _DB_

-+{

-+  DB_TXN *txn;

-+  MDB_dbi db;

-+  MDB_env *env;

-+  int  (*close) (struct _DB_ *, u_int32_t);

-+  int  (*cursor)(struct _DB_ *, struct _DB_TXN_ *, struct _DBC_ **, u_int32_t);

-+  int  (*get) (struct _DB_ *, struct _DB_TXN_ *, struct _DBT_ *, struct _DBT_ *, u_int32_t);

-+  int  (*get_byteswapped) (struct _DB_ *, int *);

-+  int  (*open) (struct _DB_ *,

-+                  struct _DB_TXN_ *,

-+                  const char *,

-+                  const char *,

-+                  DBTYPE,

-+                  u_int32_t,

-+                  int);

-+}DB;

-+

-+//definitions from db.h

-+#define	DB_CREATE     0x00000001

-+#define	DB_INIT_CDB   0x00000080

-+#define	DB_INIT_MPOOL 0x00000400

-+#define	DB_PRIVATE    0x00010000

-+#define	DB_RDONLY     0x00000400

-+

-+#define	DB_NEXT       16

-+#define	DB_SET        26

-+

-+int db_env_create (DB_ENV **, u_int32_t);

-+int db_create (DB **, DB_ENV *, u_int32_t);

-+

-+#define bail_on_error(nerror) \

-+    do {                                                           \

-+        if (nerror)                                               \

-+        {                                                          \

-+            goto error;                                            \

-+        }                                                          \

-+    } while(0)

-+#endif//RPM_LMDB_H

-diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c

-index fe05bec..9f4ad31 100644

-+++ b/ext/repo_rpmdb.c

-@@ -25,6 +25,7 @@

- #include <errno.h>

- 

- #ifdef ENABLE_RPMDB

-+#define ENABLE_RPMDB_LMDB

- 

- #include <rpm/rpmio.h>

- #include <rpm/rpmpgp.h>

-@@ -37,7 +38,11 @@

- # if defined(SUSE) || defined(HAVE_RPM_DB_H)

- #  include <rpm/db.h>

- # else

--#  include <db.h>

-+#  ifdef ENABLE_RPMDB_LMDB

-+#   include "db_lmdb.h"

-+#  else

-+#   include <db.h>

-+#  endif

- # endif

- #endif

- 

-@@ -1515,7 +1520,7 @@ count_headers(struct rpmdbstate *state)

-   DBT dbkey;

-   DBT dbdata;

- 

--  snprintf(dbpath, PATH_MAX, "%s%s/Name", state->rootdir ? state->rootdir : "", state->is_ostree ? "/usr/share/rpm" : "/var/lib/rpm");

-+  snprintf(dbpath, PATH_MAX, "%s%s/data.mdb", state->rootdir ? state->rootdir : "", state->is_ostree ? "/usr/share/rpm" : "/var/lib/rpm");

-   if (stat(dbpath, &statbuf))

-     return 0;

-   memset(&dbkey, 0, sizeof(dbkey));

-@@ -1841,7 +1846,7 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags)

-     }

- 

-   /* XXX: should get ro lock of Packages database! */

--  snprintf(dbpath, PATH_MAX, "%s%s/Packages", state.rootdir ? state.rootdir : "", state.is_ostree ? "/usr/share/rpm" : "/var/lib/rpm");

-+  snprintf(dbpath, PATH_MAX, "%s%s/data.mdb", state.rootdir ? state.rootdir : "", state.is_ostree ? "/usr/share/rpm" : "/var/lib/rpm");

-   if (stat(dbpath, &packagesstat))

-     {

-       pool_error(pool, -1, "%s: %s", dbpath, strerror(errno));

@@ -6,14 +6,14 @@ License:        BSD

 URL:            https://github.com/openSUSE/libsolv

 Source0:        https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.tar.gz

 %define sha1    libsolv=7699af00e648bf3e631246559c48ceb7f3f544b9

-Patch0:         libsolv-lmdb.patch

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Requires:       lmdb

+Requires:       libdb

 Requires:       expat-libs

-BuildRequires:  lmdb-devel

+BuildRequires:  libdb-devel

 BuildRequires:  cmake

+BuildRequires:  rpm-devel

 BuildRequires:  expat-devel

 Provides:       pkgconfig(libsolv)

 %description

@@ -30,19 +30,16 @@ for developing applications that use libsolv.

 %prep

 %setup -q

-%patch0 -p1

-

 %build

 cmake \

     -DCMAKE_INSTALL_PREFIX=%{_prefix} \

-    -DPHOTON=ON

+    -DRPM5=ON \

+    -DENABLE_RPMDB=ON \

+    -DENABLE_COMPLEX_DEPS=ON

 make %{?_smp_mflags}

-

 %install

 make DESTDIR=%{buildroot} install

 find %{buildroot} -name '*.la' -delete

-#cp ext/repo_*.h %{buildroot}%{_includedir}/solv

-

 %check

 make %{?_smp_mflags} test

deleted file mode 100644

@@ -1,10 +0,0 @@

-prefix=/usr

-exec_prefix=${prefix}

-libdir=${exec_prefix}/lib

-includedir=${prefix}/include

-

-Name: lmdb

-Description: Lightning memory-mapped database manager

-Version: 0.9.21

-Libs: -L${libdir} -llmdb

-Cflags: -I${includedir}

deleted file mode 100644

@@ -1,70 +0,0 @@

-Summary:       Lightning memory-mapped database manager

-Name:          lmdb

-Version:       0.9.21

-Release:       1%{?dist}

-Group:         System/Libraries

-Vendor:        VMware, Inc.

-License:       OpenLDAP

-URL:           https://github.com/LMDB/lmdb

-Source0:       https://github.com/LMDB/lmdb/archive/LMDB_%{version}.tar.gz

-%define sha1 LMDB=54d10ee9afaba8db75c8c73832da10b0a47e5807

-Source1:       %{name}.pc

-Distribution:  Photon

-

-%description

-Lightning memory-mapped database manager

-

-%package devel

-Summary:    Development files for lmdb

-Group:      Development/Libraries

-Requires:   lmdb = %{version}-%{release}

-

-%description devel

-Development files for lmdb

-

-%prep

-%setup -qn lmdb-LMDB_%{version}

-

-%build

-cd libraries/liblmdb

-make

-

-%install

-%define relpath       %{_builddir}/%{buildsubdir}/libraries/liblmdb

-mkdir -p %{buildroot}%{_libdir}

-mkdir -p %{buildroot}%{_libdir}/pkgconfig

-mkdir -p %{buildroot}%{_bindir}

-mkdir -p %{buildroot}%{_includedir}

-mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}

-

-install -m0755 %{relpath}/liblmdb.so %{buildroot}%{_libdir}

-install -m0755 %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig

-install -m0755 %{relpath}/mdb_copy %{buildroot}%{_bindir}

-install -m0755 %{relpath}/mdb_dump %{buildroot}%{_bindir}

-install -m0755 %{relpath}/mdb_load %{buildroot}%{_bindir}

-install -m0755 %{relpath}/mdb_stat %{buildroot}%{_bindir}

-install -m0644 %{relpath}/lmdb.h %{buildroot}%{_includedir}

-install -m0644 %{relpath}/{CHANGES,LICENSE,intro.doc} %{buildroot}%{_docdir}/%{name}-%{version}

-

-%post

-

-    /sbin/ldconfig

-

-    # First argument is 1 => New Installation

-    # First argument is 2 => Upgrade

-

-%clean

-rm -rf %{buildroot}/*

-

-%files

-%{_docdir}/*

-%{_libdir}/*.so

-%{_bindir}/*

-

-%files devel

-%{_includedir}/*

-%{_libdir}/pkgconfig/%{name}.pc

-

-%changelog

-*  Wed Dec 13 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.9.21-1

--  Initial

@@ -2,7 +2,7 @@

 Summary:	Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. 

 Name:		net-snmp   

 Version:	5.7.3

-Release:	8%{?dist}

+Release:	7%{?dist}

 License:	BSD (like)  

 URL:		http://net-snmp.sourceforge.net/

 Group:		Productivity/Networking/Other

@@ -48,8 +48,7 @@ The net-snmp-devel package contains headers and libraries for building SNMP appl

 		--with-systemd \

 		--disable-static \

 		--with-x=no \

-		--enable-as-needed \

-                --without-rpm

+		--enable-as-needed

 make

 %install

@@ -97,8 +96,6 @@ rm -rf %{buildroot}/*

 %exclude /usr/lib/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod

 %changelog

-*	Wed Jan 31 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.7.3-8

--	build without rpm support

 *	Mon Jul 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 5.7.3-7

 -	Make service file a different source

 *	Tue Apr 04 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.7.3-6

@@ -1,7 +1,7 @@

 Summary:        Open Source Security Compliance Solution

 Name:           openscap

 Version:        1.2.14

-Release:        4%{?dist}

+Release:        3%{?dist}

 License:        GPL2+

 URL:            https://www.open-scap.org

 Source0:        https://github.com/OpenSCAP/openscap/releases/download/%{version}/openscap-%{version}.tar.gz

@@ -20,7 +20,6 @@ BuildRequires:  bzip2-devel

 BuildRequires:  curl-devel

 BuildRequires:  popt-devel

 BuildRequires:  python2-devel

-BuildRequires:  lmdb-devel

 Requires:       curl

 Requires:       popt

 %description

@@ -96,8 +95,6 @@ find %{buildroot} -name '*.la' -delete

 %{_libdir}/python2.7/*

 %changelog

-*   Sun Mar 04 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.14-4

--   added build requires lmdb-devel

 *   Thu Aug 10 2017 Rongrong Qiu <rqiu@vmware.com> 1.2.14-3

 -   Disable make check which need per-XML-XPATH for bug 1900358

 *   Fri May 5 2017 Alexey Makhalov <amakhalov@vmware.com> 1.2.14-2

@@ -148,7 +148,7 @@ rm -rf %{buildroot}

 *   Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com>  2015.7-8

 -   Change systemd dependency

 *   Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.7-7

--   Use setup instead of autosetup

+-   Use %setup instead of %autosetup

 *   Fri Oct 07 2016 ChangLee <changlee@vmware.com> 2015.7-6

 -   Modified %check

 *   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2015.7-5

@@ -1,7 +1,7 @@

 Summary:        Commit RPMs to an OSTree repository

 Name:           rpm-ostree

 Version:        2017.4

-Release:        8%{?dist}

+Release:        7%{?dist}

 Source0:        rpm-ostree-%{version}.tar.gz

 %define sha1    rpm-ostree=d34882a455afbf0b57617c0962725276967e838a

 Source1:        libglnx-0c52d85.tar.gz

@@ -52,7 +52,6 @@ BuildRequires:  photon-release

 BuildRequires:  photon-repos

 BuildRequires:  bubblewrap

 BuildRequires:  dbus

-BuildRequires:  lmdb-devel

 Requires:       libcap

 Requires:       librepo

@@ -129,8 +128,6 @@ make check

 %{_bindir}/rpm-ostree-host/function.inc

 %changelog

-*   Sun Mar 04 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2017.4-8

--   added build requires lmdb-devel

 *   Tue Oct 03 2017 Dheeraj Shetty <dheerajs@vmware.com> 2017.4-7

 -   Remove hardcoded /dev/loop0

 *   Tue Sep 26 2017 Dheeraj Shetty <dheerajs@vmware.com> 2017.4-6

deleted file mode 100755

@@ -1,124 +0,0 @@

-#!/bin/sh

-

-#please see https://github.com/rpm-software-management/rpm/issues/281

-#uses code from bdbexport.sh and lmdbimport.sh posted in the discussion. 

-

-#Use: tool to convert bdb to lmdb and replace existing bdb.

-

-#running rpm --rebuilddb is recommended after conversion

-#for scenarios like docker, photon-micro etc

-#rpm might not be installed as just rpm-libs is enough.

-#a warning is issued in this case.

-

-#not designed to run multiple times without doing manual

-#maintenance in between (move backup folders etc)

-

-LMDB=/var/lib/rpmdb-lmdb

-BDB=/var/lib/rpm

-DUMPDIR=DUMP

-

-#bdb database file names

-TAGS="

-Packages

-Name

-Basenames

-Group

-Requirename

-Providename

-Conflictname

-Obsoletename

-Triggername

-Dirnames

-Installtid

-Sigmd5

-Sha1header

-Filetriggername

-Transfiletriggername

-Recommendname

-Suggestname

-Supplementname

-Enhancename

-"

-

-#backup existing bdb to /var/lib/rpm-bdb-backup

-function backup_and_replace_rpmdb() {

-  echo "backed up existing bdb to $BDB-bdb-backup"

-  mv $BDB $BDB-bdb-backup

-  mv $LMDB $BDB

-  if [ -x /usr/bin/rpm ]; then

-    rpm --rebuilddb

-  else

-    echo 'rpm binary not found. not running rebuilddb. please install rpm and run rpm --rebuilddb.'

-  fi

-}

-

-function export_from_bdb() {

-

-  rm -rf $DUMPDIR

-  mkdir -p $DUMPDIR

-

-  # --- export all the databases

-  for TAG in $TAGS; do

-    echo "-- $TAG --"

-    [ -f $BDB/$TAG ] || continue

-  # --- change from hash -> btree, including swabbing integer keys

-    db_dump $BDB/$TAG | \

-      sed -e's,^type=hash,type=btree,' -e'/^h_nelem=/d' -e'/^db_pagesize=/d' \

-	-e's,^ \(..\)\(..\)\(..\)\(..\)$, \4\3\2\1,' \

-	> $DUMPDIR/$TAG.btree

-  done

-}

-

-function import_to_lmdb() {

-  rm -rf $LMDB

-  mkdir -p $LMDB

-

-  # --- initialize the lmdb parameters (mapsize MUST be sufficiently large)

-  cat << EOF | mdb_load $LMDB

-VERSION=3

-format=bytevalue

-type=btree

-mapsize=1048576000

-maxreaders=64

-HEADER=END

-DATA=END

-EOF

-

-  # --- import the rpmdb dumps, creating empty indices (unused on RHEL7) as needed

-  for TAG in $TAGS; do

-    echo "-- $TAG --"