packages (rpm-4_5): rpm/rpm-am.patch, rpm/rpm.spec - really fix am stupidity

[baggins]

Author: baggins                      Date: Thu Jan 26 21:43:09 2012 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- really fix am stupidity

---- Files affected:
packages/rpm:
   rpm-am.patch (1.1.2.1 -> 1.1.2.2) , rpm.spec (1.837.2.42.2.49.2.113 -> 1.837.2.42.2.49.2.114) 

---- Diffs:

================================================================
Index: packages/rpm/rpm-am.patch
diff -u packages/rpm/rpm-am.patch:1.1.2.1 packages/rpm/rpm-am.patch:1.1.2.2
--- packages/rpm/rpm-am.patch:1.1.2.1	Thu Jan 26 22:16:53 2012
+++ packages/rpm/rpm-am.patch	Thu Jan 26 22:43:03 2012
@@ -1,11 +1,10 @@
 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 @@
- 
+@@ -45,7 +45,8 @@
  bin_PROGRAMS = 		rpm rpmbuild
  
--pkglibdir =		@USRLIBRPM@
+ pkglibdir =		@USRLIBRPM@
 -pkglib_DATA =	rpmpopt macros
 +pkgdatadir =		@USRLIBRPM@
 +pkgdata_DATA =	rpmpopt macros
@@ -15,28 +14,26 @@
 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 @@
- 
+@@ -27,7 +27,8 @@
  bin_SCRIPTS = gendiff rpm2cpio
  
--pkglibdir =		@USRLIBRPM@
+ pkglibdir =		@USRLIBRPM@
 -pkglib_SCRIPTS = \
-+pkgdatadir =		@USRLIBRPM@
-+pkgdata_SCRIPTS = \
++pkgbindir =		@USRLIBRPM@
++pkgbin_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 @@
- 
+@@ -23,7 +23,8 @@
  bin_PROGRAMS =		rpmdigest rpmmtree rpmrepo
  
--pkglibdir =		@USRLIBRPM@
+ pkglibdir =		@USRLIBRPM@
 -pkglib_PROGRAMS =	rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
-+pkgdir =		@USRLIBRPM@
-+pkg_PROGRAMS =	rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
++pkgbindir =		@USRLIBRPM@
++pkgbin_PROGRAMS =	rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
  
  convertdb1_SOURCES =	convertdb1.c
  

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.113 packages/rpm/rpm.spec:1.837.2.42.2.49.2.114
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.113	Thu Jan 26 22:18:29 2012
+++ packages/rpm/rpm.spec	Thu Jan 26 22:43:03 2012
@@ -929,8 +929,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	staticLDFLAGS=%{?with_static:-all-static} \
-	pylibdir=%{py_libdir} \
-	pkgbindir="%{_bindir}"
+	pylibdir=%{py_libdir}
 
 cat <<'EOF' > $RPM_BUILD_ROOT/etc/tmpwatch/rpm.conf
 # Cleanup 90-days old repackage files.
@@ -1494,6 +1493,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.114  2012/01/26 21:43:03  baggins
+- really fix am stupidity
+
 Revision 1.837.2.42.2.49.2.113  2012/01/26 21:18:29  baggins
 - added patch to hack round automake 1.11.2 stupidity
 
================================================================

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