projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| e15d11aa ER |
1 | --- rpm-4.5/configure.ac~ 2008-06-12 22:16:53.000000000 +0300 |
| 2 | +++ rpm-4.5/configure.ac 2008-06-12 22:19:01.103542424 +0300 | |
| 3 | @@ -1496,7 +1496,7 @@ | |
| 4 | [Colon separated paths of rpmrc files to read.]) | |
| 5 | AC_SUBST(RPMRCFILES) | |
| 6 | ||
| 7 | -RPMPOPTFILE="${USRLIBRPM}/${VERSION}/rpmpopt" | |
| 8 | +RPMPOPTFILE="${USRLIBRPM}/rpmpopt" | |
| 9 | AC_DEFINE_UNQUOTED(RPMPOPTFILE, "$RPMPOPTFILE", | |
| 10 | [Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt)]) | |
| 11 | AC_SUBST(RPMPOPTFILE) | |
| 12 | --- rpm-4.5/macros.in~ 2008-06-11 10:53:07.000000000 +0300 | |
| 13 | +++ rpm-4.5/macros.in 2008-06-11 21:59:36.949096310 +0300 | |
| 14 | @@ -33,7 +33,7 @@ | |
| 15 | %_usrlibrpm @USRLIBRPM@ | |
| 16 | %_etcrpm @SYSCONFIGDIR@ | |
| 17 | ||
| 18 | -%_rpmhome %{_usrlibrpm}/%{_rpmversion} | |
| 19 | +%_rpmhome %{_usrlibrpm} | |
| 20 | ||
| 21 | #============================================================================== | |
| 22 | # ---- Generally useful path macros. | |
| 23 | --- rpm-4.5/Makefile.am~ 2008-06-11 10:52:27.000000000 +0300 | |
| 24 | +++ rpm-4.5/Makefile.am 2008-06-11 22:04:00.280274462 +0300 | |
| 25 | @@ -46,8 +46,7 @@ | |
| 26 | bin_PROGRAMS = rpm rpmbuild | |
| 27 | ||
| 28 | pkglibdir = @USRLIBRPM@ | |
| 29 | -versionlibdir = $(pkglibdir)/@VERSION@ | |
| 30 | -versionlib_DATA = rpmpopt macros | |
| 31 | +pkglib_DATA = rpmpopt macros | |
| 32 | ||
| 33 | noinst_HEADERS = build.h debug.h system.h | |
| 34 | ||
| 35 | --- rpm-4.5/tools/Makefile.am~ 2008-07-09 13:30:54.000000000 +0300 | |
| 36 | +++ rpm-4.5/tools/Makefile.am 2008-07-09 13:34:07.594546056 +0300 | |
| 37 | @@ -24,8 +24,7 @@ | |
| 38 | bin_PROGRAMS = rpmdigest rpmmtree rpmrepo | |
| 39 | ||
| 40 | pkglibdir = @USRLIBRPM@ | |
| 41 | -versionlibdir = $(pkglibdir)/@VERSION@ | |
| 42 | -versionlib_PROGRAMS = rpmdeps @WITH_LIBDWARF_DEBUGEDIT@ | |
| 43 | +pkglib_PROGRAMS = rpmdeps @WITH_LIBDWARF_DEBUGEDIT@ | |
| 44 | ||
| 45 | convertdb1_SOURCES = convertdb1.c | |
| 46 | ||
| 47 | --- rpm-4.5/scripts/Makefile.am~ 2008-05-21 23:48:02.000000000 +0300 | |
| 48 | +++ rpm-4.5/scripts/Makefile.am 2008-06-11 22:05:28.257345656 +0300 | |
| 49 | @@ -28,8 +28,7 @@ | |
| 50 | bin_SCRIPTS = gendiff rpm2cpio | |
| 51 | ||
| 52 | pkglibdir = @USRLIBRPM@ | |
| 53 | -versionlibdir = $(pkglibdir)/@VERSION@ | |
| 54 | -versionlib_SCRIPTS = \ | |
| 55 | +pkglib_SCRIPTS = \ | |
| 56 | brp-compress brp-python-bytecompile brp-java-gcjcompile \ | |
| 57 | brp-strip brp-strip-comment-note brp-nobuildrootpath \ | |
| 58 | brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ |