packages (rpm-4_5): rpm/rpm-am.patch - hack around automake 1.11.2 stupidity

[baggins]

Author: baggins                      Date: Thu Jan 26 21:16:58 2012 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- hack around automake 1.11.2 stupidity

---- Files affected:
packages/rpm:
   rpm-am.patch (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: packages/rpm/rpm-am.patch
diff -u packages/rpm/rpm-am.patch:1.1 packages/rpm/rpm-am.patch:1.1.2.1
--- packages/rpm/rpm-am.patch:1.1	Fri Oct 23 22:02:40 2009
+++ packages/rpm/rpm-am.patch	Thu Jan 26 22:16:53 2012
@@ -1,11 +1,42 @@
---- rpm-5.1.9/rpmdb/Makefile.am.orig	2009-04-12 21:46:28.000000000 +0200
-+++ rpm-5.1.9/rpmdb/Makefile.am	2009-10-23 21:35:13.000000000 +0200
-@@ -108,7 +108,7 @@
- 
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(pkgincdir)
--	$(pkgincHEADERS_INSTALL) $(my_DB_HEADER) $(DESTDIR)$(pkgincdir)/db.h
-+	$(install_sh_DATA) $(my_DB_HEADER) $(DESTDIR)$(pkgincdir)/db.h
+diff -ur rpm-4.5/Makefile.am rpm-4.5-ac/Makefile.am
+--- rpm-4.5/Makefile.am	2012-01-26 22:11:55.875577134 +0100
++++ rpm-4.5-ac/Makefile.am	2012-01-26 22:10:47.855842412 +0100
+@@ -45,8 +45,8 @@
+ 
+ bin_PROGRAMS = 		rpm rpmbuild
+ 
+-pkglibdir =		@USRLIBRPM@
+-pkglib_DATA =	rpmpopt macros
++pkgdatadir =		@USRLIBRPM@
++pkgdata_DATA =	rpmpopt macros
+ 
+ noinst_HEADERS = build.h debug.h system.h
+ 
+diff -ur rpm-4.5/scripts/Makefile.am rpm-4.5-ac/scripts/Makefile.am
+--- rpm-4.5/scripts/Makefile.am	2012-01-26 22:11:55.752244281 +0100
++++ rpm-4.5-ac/scripts/Makefile.am	2012-01-26 22:07:08.238669872 +0100
+@@ -27,8 +27,8 @@
+ 
+ bin_SCRIPTS = gendiff rpm2cpio
+ 
+-pkglibdir =		@USRLIBRPM@
+-pkglib_SCRIPTS = \
++pkgdatadir =		@USRLIBRPM@
++pkgdata_SCRIPTS = \
+ 	brp-compress brp-python-bytecompile brp-java-gcjcompile \
+ 	brp-strip brp-strip-comment-note brp-nobuildrootpath \
+ 	brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
+diff -ur rpm-4.5/tools/Makefile.am rpm-4.5-ac/tools/Makefile.am
+--- rpm-4.5/tools/Makefile.am	2012-01-26 22:11:55.748910960 +0100
++++ rpm-4.5-ac/tools/Makefile.am	2012-01-26 22:11:02.329119298 +0100
+@@ -23,8 +23,8 @@
+ 
+ bin_PROGRAMS =		rpmdigest rpmmtree rpmrepo
+ 
+-pkglibdir =		@USRLIBRPM@
+-pkglib_PROGRAMS =	rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
++pkgdir =		@USRLIBRPM@
++pkg_PROGRAMS =	rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
+ 
+ convertdb1_SOURCES =	convertdb1.c
  
- clean-local:
- 	rm -f *.o tagtbl.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-am.patch?r1=1.1&r2=1.1.2.1&f=u