RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm file Date: 17-Jun-2007 03:11:49
Branch: rpm-4_5 HEAD Handle: 2007061702114702
Modified files:
file/magic Makefile.am
file/src Makefile.am
Modified files: (Branch: rpm-4_5)
rpm CHANGES Makefile.am macros.in rpm.spec.in
rpm/rpmdb Makefile.am
rpm/scripts Makefile.am
rpm/tools Makefile.am
Log:
- add _rpmhome macro, revector helper paths through _rpmhome.
- hack a version into magic install path. better needs to be done.
- start consistent versionlibdir usage in all Makefile.am files.
Summary:
Revision Changes Path
1.18 +1 -1 file/magic/Makefile.am
1.25 +1 -1 file/src/Makefile.am
1.1360.2.20 +3 -0 rpm/CHANGES
2.160.2.7 +1 -1 rpm/Makefile.am
1.159.2.6 +38 -35 rpm/macros.in
2.431.2.10 +42 -42 rpm/rpm.spec.in
1.53.2.3 +4 -3 rpm/rpmdb/Makefile.am
1.34.2.3 +1 -1 rpm/scripts/Makefile.am
2.85.2.1 +3 -2 rpm/tools/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: file/magic/Makefile.am
============================================================================
$ cvs diff -u -r1.17 -r1.18 Makefile.am
--- file/magic/Makefile.am 25 May 2007 17:36:00 -0000 1.17
+++ file/magic/Makefile.am 17 Jun 2007 01:11:48 -0000 1.18
@@ -1,5 +1,5 @@
#pkgdata_DATA = magic magic.mime magic.mgc magic.mime.mgc
-pkglibdir = @prefix@/lib/rpm
+pkglibdir = @prefix@/lib/rpm/4.5
pkglib_DATA = magic magic.mime magic.mgc magic.mime.mgc
EXTRA_DIST = magic2mime Localstuff Header magic.mime $(magic_FRAGMENTS)
@@ .
patch -p0 <<'@@ .'
Index: file/src/Makefile.am
============================================================================
$ cvs diff -u -r1.24 -r1.25 Makefile.am
--- file/src/Makefile.am 25 May 2007 17:36:01 -0000 1.24
+++ file/src/Makefile.am 17 Jun 2007 01:11:48 -0000 1.25
@@ -6,7 +6,7 @@
# XXX Make sure compress.c links internal zlib
INCLUDES = -I../.. -I../../zlib
-pkglibdir = @prefix@/lib/rpm
+pkglibdir = @prefix@/lib/rpm/4.5
MAGIC = $(pkglibdir)/magic
AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' -DHAVE_LIBZ=1
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1360.2.19 -r1.1360.2.20 CHANGES
--- rpm/CHANGES 16 Jun 2007 23:07:07 -0000 1.1360.2.19
+++ rpm/CHANGES 17 Jun 2007 01:11:47 -0000 1.1360.2.20
@@ -1,4 +1,7 @@
4.4.9 -> 4.5:
+ - jbj: add _rpmhome macro, revector helper paths through _rpmhome.
+ - jbj: hack a version into magic install path. better needs to be done.
+ - jbj: start consistent versionlibdir usage in all Makefile.am files.
- jbj: populate /usr/lib/rpm/@VERSION@/ instead of [EMAIL PROTECTED]@
files.
- jbj: move gendiff into the scripts directory.
- jbj: don't include perl/CVS with "make dist".
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.160.2.6 -r2.160.2.7 Makefile.am
--- rpm/Makefile.am 16 Jun 2007 23:07:07 -0000 2.160.2.6
+++ rpm/Makefile.am 17 Jun 2007 01:11:47 -0000 2.160.2.7
@@ -6,7 +6,7 @@
EXTRA_DIST = config.rpath m4/ChangeLog CHANGES CREDITS Doxyheader GROUPS
INSTALL \
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
- config.site db db3/configure gendiff installplatform platform* \
+ config.site db db3/configure installplatform platform* \
perl/Changes perl/MANIFEST perl/META.yml perl/Makefile.PL \
perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in perl/README \
perl/RPM.pm perl/RPM.xs perl/foo.i386.rpm perl/hdlist-test.hdr \
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.159.2.5 -r1.159.2.6 macros.in
--- rpm/macros.in 10 Jun 2007 17:12:24 -0000 1.159.2.5
+++ rpm/macros.in 17 Jun 2007 01:11:47 -0000 1.159.2.6
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.159.2.5 2007/06/10 17:12:24 jbj Exp $
+# $Id: macros.in,v 1.159.2.6 2007/06/17 01:11:47 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -9,7 +9,7 @@
# be added to ~/.rpmmacros.
#
#==============================================================================
-# Macro naming conventions (preliminary):
+# Macro naming conventions:
#
# Macros that begin with an underscore are "local" in the sense that
# they (if used) will not be exported in rpm headers. Some macros
@@ -17,6 +17,7 @@
# are compatible with macros generated by rpm-2.5.x and will be made
# more consistent in a future release.
#
+%_rpmversion @VERSION@
#==============================================================================
# ---- A macro that expands to nothing.
@@ -32,6 +33,8 @@
%_usrlibrpm @USRLIBRPM@
%_etcrpm @SYSCONFIGDIR@
+%_rpmhome %{_usrlibrpm}/%{_rpmversion}
+
#==============================================================================
# ---- Generally useful path macros.
#
@@ -181,7 +184,7 @@
# Path to script that creates debug symbols in a /usr/lib/debug
# shadow tree.
%__debug_install_post \
- %{_usrlibrpm}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+ %{_rpmhome}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
%{nil}
# Template for debug information sub-package.
@@ -384,7 +387,7 @@
# Returns list of unpackaged files, i.e. files in $RPM_BUILD_ROOT not
packaged.
#
# Note: Disable (by commenting out) for legacy compatibility.
-%__check_files %{_usrlibrpm}/check-files %{buildroot}
+%__check_files %{_rpmhome}/check-files %{buildroot}
#
# Should unpackaged files in a build root terminate a build?
@@ -447,10 +450,10 @@
# Path to scripts to autogenerate package dependencies,
#
# Note: Used iff _use_internal_dependency_generator is zero.
-#%__find_provides %{_usrlibrpm}/rpmdeps --provides
-#%__find_requires %{_usrlibrpm}/rpmdeps --requires
-%__find_provides %{_usrlibrpm}/find-provides
-%__find_requires %{_usrlibrpm}/find-requires
+#%__find_provides %{_rpmhome}/rpmdeps --provides
+#%__find_requires %{_rpmhome}/rpmdeps --requires
+%__find_provides %{_rpmhome}/find-provides
+%__find_requires %{_rpmhome}/find-requires
#%__find_conflicts ???
#%__find_obsoletes ???
@@ -906,7 +909,7 @@
%_rpmds_getconf_path /
#
-%_rpmds_perldeps_cmd %{__find} %{_libdir}/perl5 | %{_usrlibrpm}/perl.prov
+%_rpmds_perldeps_cmd %{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov
#
%_varrun /var/run
@@ -1305,7 +1308,7 @@
# ...
# %files -f %{name}.lang
#
-%find_lang %{_usrlibrpm}/find-lang.sh %{buildroot}
+%find_lang %{_rpmhome}/find-lang.sh %{buildroot}
#------------------------------------------------------------------------
# lua macros
@@ -1325,11 +1328,11 @@
# Path to scripts to autogenerate perl package dependencies,
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
-# helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
-#%__perl_provides %{_usrlibrpm}/perldeps.pl --provides
-#%__perl_requires %{_usrlibrpm}/perldeps.pl --requires
-%__perl_provides %{_usrlibrpm}/perl.prov
-%__perl_requires %{_usrlibrpm}/perl.req
+# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+#%__perl_provides %{_rpmhome}/perldeps.pl --provides
+#%__perl_requires %{_rpmhome}/perldeps.pl --requires
+%__perl_provides %{_rpmhome}/perl.prov
+%__perl_requires %{_rpmhome}/perl.req
# Useful macros for building *.rpm perl packages.
# (from Artur Frysiak <[EMAIL PROTECTED]>)
@@ -1370,9 +1373,9 @@
# Path to scripts to autogenerate python package dependencies,
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
-# helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
-%__python_provides %{_usrlibrpm}/pythondeps.sh --provides
-%__python_requires %{_usrlibrpm}/pythondeps.sh --requires
+# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+%__python_provides %{_rpmhome}/pythondeps.sh --provides
+%__python_requires %{_rpmhome}/pythondeps.sh --requires
# Useful macros for building *.rpm python packages (for python > 1.6).
#
@@ -1395,11 +1398,11 @@
# Path to scripts to autogenerate php package dependencies,
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
-# helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
-#%__php_provides %{_usrlibrpm}/phpdeps.sh --provides
-#%__php_requires %{_usrlibrpm}/phpdeps.sh --requires
-#%__php_provides %{_usrlibrpm}/php.prov
-#%__php_requires %{_usrlibrpm}/php.req
+# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+#%__php_provides %{_rpmhome}/phpdeps.sh --provides
+#%__php_requires %{_rpmhome}/phpdeps.sh --requires
+#%__php_provides %{_rpmhome}/php.prov
+#%__php_requires %{_rpmhome}/php.req
#------------------------------------------------------------------------
# java(...) configuration.
@@ -1407,9 +1410,9 @@
# Path to scripts to autogenerate java package dependencies,
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
-# helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
-%__java_provides %{_usrlibrpm}/javadeps.sh --provides
-%__java_requires %{_usrlibrpm}/javadeps.sh --requires
+# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+%__java_provides %{_rpmhome}/javadeps.sh --provides
+%__java_requires %{_rpmhome}/javadeps.sh --requires
#------------------------------------------------------------------------
# libtool(...) configuration.
@@ -1417,9 +1420,9 @@
# Path to scripts to autogenerate libtool package dependencies,
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
-# helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
-%__libtool_provides %{_usrlibrpm}/libtooldeps.sh --provides %{buildroot}
%{name}
-%__libtool_requires %{_usrlibrpm}/libtooldeps.sh --requires %{buildroot}
%{name}
+# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+%__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot}
%{name}
+%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot}
%{name}
#------------------------------------------------------------------------
# pkgconfig(...) configuration.
@@ -1427,9 +1430,9 @@
# Path to scripts to autogenerate pkgconfig package dependencies,
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
-# helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
-%__pkgconfig_provides %{_usrlibrpm}/pkgconfigdeps.sh --provides
-%__pkgconfig_requires %{_usrlibrpm}/pkgconfigdeps.sh --requires
+# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+%__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides
+%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
#------------------------------------------------------------------------
# executable(...) configuration.
@@ -1437,9 +1440,9 @@
# Path to scripts to autogenerate executable(foo) script dependencies,
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
-# helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
-#%__executable_provides %{_usrlibrpm}/executabledeps.sh --provides
-#%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires
+# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+#%__executable_provides %{_rpmhome}/executabledeps.sh --provides
+#%__executable_requires %{_rpmhome}/executabledeps.sh --requires
%__scriptlet_requires /bin/bash --rpm-requires
# \endverbatim
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
============================================================================
$ cvs diff -u -r2.431.2.9 -r2.431.2.10 rpm.spec.in
--- rpm/rpm.spec.in 16 Jun 2007 19:00:09 -0000 2.431.2.9
+++ rpm/rpm.spec.in 17 Jun 2007 01:11:47 -0000 2.431.2.10
@@ -5,6 +5,7 @@
%define with_apidocs @[EMAIL PROTECTED]
%{!?_usrlibrpm:%global _usrlibrpm @[EMAIL PROTECTED]
+%{!?_rpmhome:%global _rpmhome @USRLIBRPM@/@[EMAIL PROTECTED]
%define __prefix %{?_prefix}%{!?_prefix:/usr}
%{?!_lib: %define _lib lib}
@@ -208,7 +209,7 @@
# Get rid of unpackaged files
{ cd $RPM_BUILD_ROOT
- rm -f
.%{_usrlibrpm}/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,trpm}
+ rm -f
.%{_rpmhome}/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,trpm}
rm -rf .%{_mandir}/man8/rpmcache.8*
rm -rf .%{_mandir}/man8/rpmgraph.8*
rm -rf .%{_mandir}/ja/man8/rpmcache.8*
@@ -281,10 +282,11 @@
%rpmattr %{_bindir}/gendiff
%attr(0755, @RPMUSER@, @RPMGROUP@) %dir %{_usrlibrpm}
-%attr(0644, @RPMUSER@, @RPMGROUP@) %{_usrlibrpm}/[EMAIL PROTECTED]@
-%rpmattr %{_usrlibrpm}/rpm.*
-%rpmattr %{_usrlibrpm}/tgpg
-%attr(0644, @RPMUSER@, @RPMGROUP@) %{_usrlibrpm}/[EMAIL PROTECTED]@
+%attr(0755, @RPMUSER@, @RPMGROUP@) %dir %{_rpmhome}
+%attr(0644, @RPMUSER@, @RPMGROUP@) %{_rpmhome}/macros
+%rpmattr %{_rpmhome}/rpm.*
+%rpmattr %{_rpmhome}/tgpg
+%attr(0644, @RPMUSER@, @RPMGROUP@) %{_rpmhome}/rpmpopt
%ifarch i386 i486 i586 i686 athlon pentium3 pentium4
%attr(-, @RPMUSER@, @RPMGROUP@) %{_usrlibrpm}/i[3456]86*
@@ -320,8 +322,8 @@
%endif
%attr(-, @RPMUSER@, @RPMGROUP@) %{_usrlibrpm}/noarch*
-%rpmattr %{_usrlibrpm}/rpmdb_loadcvt
-%rpmattr %{_usrlibrpm}/db_*
+%rpmattr %{_rpmhome}/rpmdb_loadcvt
+%rpmattr %{_rpmhome}/db_*
%{_mandir}/man8/rpm.8*
%{_mandir}/man8/rpm2cpio.8*
@@ -349,41 +351,39 @@
%dir %{__prefix}/src/rpm/SRPMS
%dir %{__prefix}/src/rpm/RPMS
%{__prefix}/src/rpm/RPMS/*
-%rpmattr %{_bindir}/rpmbuild
-%rpmattr %{_usrlibrpm}/brp-*
-%rpmattr %{_usrlibrpm}/check-files
-%rpmattr %{_usrlibrpm}/cross-build
-%rpmattr %{_usrlibrpm}/debugedit
-%rpmattr %{_usrlibrpm}/find-debuginfo.sh
-%rpmattr %{_usrlibrpm}/find-lang.sh
-%rpmattr %{_usrlibrpm}/find-prov.pl
-%rpmattr %{_usrlibrpm}/find-provides.perl
-%rpmattr %{_usrlibrpm}/find-req.pl
-%rpmattr %{_usrlibrpm}/find-requires.perl
-%rpmattr %{_usrlibrpm}/getpo.sh
-%rpmattr %{_usrlibrpm}/http.req
-%rpmattr %{_usrlibrpm}/javadeps.sh
-%rpmattr %{_usrlibrpm}/magic
-%rpmattr %{_usrlibrpm}/magic.mgc
-%rpmattr %{_usrlibrpm}/magic.mime
-%rpmattr %{_usrlibrpm}/magic.mime.mgc
-
-%rpmattr %{_usrlibrpm}/executabledeps.sh
-%rpmattr %{_usrlibrpm}/libtooldeps.sh
-%rpmattr %{_usrlibrpm}/perldeps.pl
-%rpmattr %{_usrlibrpm}/perl.prov
-%rpmattr %{_usrlibrpm}/perl.req
-%rpmattr %{_usrlibrpm}/php.prov
-%rpmattr %{_usrlibrpm}/php.req
-%rpmattr %{_usrlibrpm}/pkgconfigdeps.sh
-%rpmattr %{_usrlibrpm}/pythondeps.sh
-%rpmattr %{_usrlibrpm}/rpmdeps
-
-%rpmattr %{_usrlibrpm}/rpm[bt]
-%rpmattr %{_usrlibrpm}/symclash.*
-%rpmattr %{_usrlibrpm}/u_pkg.sh
-%rpmattr %{_usrlibrpm}/vpkg-provides.sh
-%rpmattr %{_usrlibrpm}/vpkg-provides2.sh
+%rpmattr %{_rpmhome}/brp-*
+%rpmattr %{_rpmhome}/check-files
+%rpmattr %{_rpmhome}/cross-build
+%rpmattr %{_rpmhome}/debugedit
+%rpmattr %{_rpmhome}/find-debuginfo.sh
+%rpmattr %{_rpmhome}/find-lang.sh
+%rpmattr %{_rpmhome}/find-prov.pl
+%rpmattr %{_rpmhome}/find-provides.perl
+%rpmattr %{_rpmhome}/find-req.pl
+%rpmattr %{_rpmhome}/find-requires.perl
+%rpmattr %{_rpmhome}/getpo.sh
+%rpmattr %{_rpmhome}/http.req
+%rpmattr %{_rpmhome}/javadeps.sh
+%rpmattr %{_rpmhome}/magic
+%rpmattr %{_rpmhome}/magic.mgc
+%rpmattr %{_rpmhome}/magic.mime
+%rpmattr %{_rpmhome}/magic.mime.mgc
+
+%rpmattr %{_rpmhome}/executabledeps.sh
+%rpmattr %{_rpmhome}/libtooldeps.sh
+%rpmattr %{_rpmhome}/perldeps.pl
+%rpmattr %{_rpmhome}/perl.prov
+%rpmattr %{_rpmhome}/perl.req
+%rpmattr %{_rpmhome}/php.prov
+%rpmattr %{_rpmhome}/php.req
+%rpmattr %{_rpmhome}/pkgconfigdeps.sh
+%rpmattr %{_rpmhome}/pythondeps.sh
+%rpmattr %{_rpmhome}/rpmdeps
+
+%rpmattr %{_rpmhome}/symclash.*
+%rpmattr %{_rpmhome}/u_pkg.sh
+%rpmattr %{_rpmhome}/vpkg-provides.sh
+%rpmattr %{_rpmhome}/vpkg-provides2.sh
%{_mandir}/man1/gendiff.1*
%{_mandir}/man8/rpmbuild.8*
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.53.2.2 -r1.53.2.3 Makefile.am
--- rpm/rpmdb/Makefile.am 16 Jun 2007 18:14:06 -0000 1.53.2.2
+++ rpm/rpmdb/Makefile.am 17 Jun 2007 01:11:48 -0000 1.53.2.3
@@ -28,13 +28,14 @@
pkginc_HEADERS = db.h header.h hdrinline.h rpmdb.h
noinst_HEADERS = fprint.h header_internal.h legacy.h
-pkgbindir = @USRLIBRPM@
-pkgbin_PROGRAMS = \
+pkglibdir = @USRLIBRPM@
+versionlibdir = $(pkglibdir)/@VERSION@
+versionlib_PROGRAMS = \
db_archive db_checkpoint db_deadlock db_dump \
db_hotbackup db_load db_printlog db_recover \
db_stat db_upgrade db_verify
if WITH_DB_RPC
-pkgbin_PROGRAMS += db_svc
+versionlib_PROGRAMS += db_svc
endif
mylibs = librpmdb.la
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
============================================================================
$ cvs diff -u -r1.34.2.2 -r1.34.2.3 Makefile.am
--- rpm/scripts/Makefile.am 16 Jun 2007 23:07:08 -0000 1.34.2.2
+++ rpm/scripts/Makefile.am 17 Jun 2007 01:11:49 -0000 1.34.2.3
@@ -36,7 +36,7 @@
check-files cross-build executabledeps.sh \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
find-provides.perl \
- find-requires.perl gendiff getpo.sh http.req \
+ find-requires.perl getpo.sh http.req \
javadeps.sh libtooldeps.sh pkgconfigdeps.sh \
perldeps.pl perl.prov perl.req pythondeps.sh \
php.prov php.req \
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
============================================================================
$ cvs diff -u -r2.85 -r2.85.2.1 Makefile.am
--- rpm/tools/Makefile.am 25 May 2007 17:36:41 -0000 2.85
+++ rpm/tools/Makefile.am 17 Jun 2007 01:11:49 -0000 2.85.2.1
@@ -21,8 +21,9 @@
LDADD = $(top_builddir)/lib/librpm.la
-pkgbindir = @USRLIBRPM@
-pkgbin_PROGRAMS = rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
+pkglibdir = @USRLIBRPM@
+versionlibdir = $(pkglibdir)/@VERSION@
+versionlib_PROGRAMS = rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
convertdb1_SOURCES = convertdb1.c
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
