Accepting request 18841 from Base:System

Copy from Base:System/rpm based on submit request 18841 from user mlschroe

OBS-URL: https://build.opensuse.org/request/show/18841
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=84

debugedit.diff

@@ -1,10 +1,10 @@
-Make debugedit build without dwarf.h. Also fixes a logic bug for ppc.
+Make debugedit build without dwarf.h
 
 Index: tools/debugedit.c
 ===================================================================
 --- tools/debugedit.c.orig
 +++ tools/debugedit.c
-@@ -34,7 +34,37 @@
+@@ -37,7 +37,37 @@
  #include <popt.h>
  
  #include <gelf.h>
@@ -41,26 +41,25 @@ Index: tools/debugedit.c
 +#define DW_FORM_ref_udata	0x15
 +#define DW_FORM_indirect	0x16
  
- #include <beecrypt/beecrypt.h>
- 
-@@ -1346,7 +1376,6 @@ handle_build_id (DSO *dso, Elf_Data *bui
-      or Elf64 object, only that we are consistent in what bits feed the
-      hash so it comes out the same for the same file contents.  */
-   {
--    inline void process (const void *data, size_t size);
-     inline void process (const void *data, size_t size)
-     {
-       memchunk chunk = { .data = (void *) data, .size = size };
-Index: tools/Makefile.am
+ #include <rpm/rpmio.h>
+ #include <rpm/rpmpgp.h>
+Index: Makefile.am
 ===================================================================
---- tools/Makefile.am.orig
-+++ tools/Makefile.am
-@@ -39,7 +39,7 @@ debugedit_SOURCES =	debugedit.c hashtab.
- #debugedit_LDADD =	@LDFLAGS_STATIC@ \
- debugedit_LDADD =	\
- 	@WITH_LIBELF_LIB@ \
--	@WITH_BEECRYPT_LIB@ \
-+	$(top_builddir)/rpmdb/librpmdb.la \
- 	@WITH_POPT_LIB@
+--- Makefile.am.orig
++++ Makefile.am
+@@ -103,7 +103,6 @@ rpm2cpio_LDADD +=	@WITH_LIBELF_LIB@ @WIT
  
- javadeps_SOURCES =	javadeps.c
+ 
+ if LIBELF
+-if LIBDWARF
+ rpmconfig_SCRIPTS += scripts/find-debuginfo.sh
+ 
+ rpmlibexec_PROGRAMS +=	debugedit
+@@ -111,7 +110,6 @@ debugedit_SOURCES =	tools/debugedit.c to
+ debugedit_LDADD =	rpmio/librpmio.la
+ debugedit_LDADD +=	@WITH_LIBELF_LIB@ @WITH_POPT_LIB@
+ endif
+-endif
+ 
+ rpmlibexec_PROGRAMS +=	javadeps
+ javadeps_SOURCES =	tools/javadeps.c