SOURCES (rpm-4_5): rpm-noversiondir.patch (NEW) - new

[glen]

Author: glen                         Date: Tue Jul 29 13:24:45 2008 GMT
Module: SOURCES                       Tag: rpm-4_5
---- Log message:
- new

---- Files affected:
SOURCES:
   rpm-noversiondir.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/rpm-noversiondir.patch
diff -u /dev/null SOURCES/rpm-noversiondir.patch:1.1.2.1
--- /dev/null	Tue Jul 29 15:24:45 2008
+++ SOURCES/rpm-noversiondir.patch	Tue Jul 29 15:24:39 2008
@@ -0,0 +1,58 @@
+--- rpm-4.5/configure.ac~	2008-06-12 22:16:53.000000000 +0300
++++ rpm-4.5/configure.ac	2008-06-12 22:19:01.103542424 +0300
+@@ -1496,7 +1496,7 @@
+ 	[Colon separated paths of rpmrc files to read.])
+ AC_SUBST(RPMRCFILES)
+ 
+-RPMPOPTFILE="${USRLIBRPM}/${VERSION}/rpmpopt"
++RPMPOPTFILE="${USRLIBRPM}/rpmpopt"
+ AC_DEFINE_UNQUOTED(RPMPOPTFILE, "$RPMPOPTFILE",
+ 	[Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt)])
+ AC_SUBST(RPMPOPTFILE)
+--- rpm-4.5/macros.in~	2008-06-11 10:53:07.000000000 +0300
++++ rpm-4.5/macros.in	2008-06-11 21:59:36.949096310 +0300
+@@ -33,7 +33,7 @@
+ %_usrlibrpm		@USRLIBRPM@
+ %_etcrpm		@SYSCONFIGDIR@
+ 
+-%_rpmhome		%{_usrlibrpm}/%{_rpmversion}
++%_rpmhome		%{_usrlibrpm}
+ 
+ #==============================================================================
+ # ---- Generally useful path macros.
+--- rpm-4.5/Makefile.am~	2008-06-11 10:52:27.000000000 +0300
++++ rpm-4.5/Makefile.am	2008-06-11 22:04:00.280274462 +0300
+@@ -46,8 +46,7 @@
+ bin_PROGRAMS = 		rpm rpmbuild
+ 
+ pkglibdir =		@USRLIBRPM@
+-versionlibdir =		$(pkglibdir)/@VERSION@
+-versionlib_DATA =	rpmpopt macros
++pkglib_DATA =	rpmpopt macros
+ 
+ noinst_HEADERS = build.h debug.h system.h
+ 
+--- rpm-4.5/tools/Makefile.am~	2008-07-09 13:30:54.000000000 +0300
++++ rpm-4.5/tools/Makefile.am	2008-07-09 13:34:07.594546056 +0300
+@@ -24,8 +24,7 @@
+ bin_PROGRAMS =		rpmdigest rpmmtree rpmrepo
+ 
+ pkglibdir =		@USRLIBRPM@
+-versionlibdir =		$(pkglibdir)/@VERSION@
+-versionlib_PROGRAMS =	rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
++pkglib_PROGRAMS =	rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
+ 
+ convertdb1_SOURCES =	convertdb1.c
+ 
+--- rpm-4.5/scripts/Makefile.am~	2008-05-21 23:48:02.000000000 +0300
++++ rpm-4.5/scripts/Makefile.am	2008-06-11 22:05:28.257345656 +0300
+@@ -28,8 +28,7 @@
+ bin_SCRIPTS = gendiff rpm2cpio
+ 
+ pkglibdir =		@USRLIBRPM@
+-versionlibdir =		$(pkglibdir)/@VERSION@
+-versionlib_SCRIPTS = \
++pkglib_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 \
================================================================