RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 27-Apr-2012 19:18:04
Branch: rpm-5_4 Handle: 2012042717180201
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros macros.in
rpm/rpmdb Makefile.am
Log:
- fhs: add some additional paths for current devel.
Summary:
Revision Changes Path
1.3501.2.252+1 -0 rpm/CHANGES
1.39.2.30 +14 -3 rpm/macros/macros.in
1.134.2.5 +9 -0 rpm/rpmdb/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.251 -r1.3501.2.252 CHANGES
--- rpm/CHANGES 27 Apr 2012 15:54:50 -0000 1.3501.2.251
+++ rpm/CHANGES 27 Apr 2012 17:18:02 -0000 1.3501.2.252
@@ -1,4 +1,5 @@
5.4.8 -> 5.4.9:
+ - jbj: fhs: add some additional paths for current devel.
- jbj: hkp: use pool.sks-keyservers.net for pubkeys.
- jbj: rpmts: hide bit test/set/clr methods behind some macros.
- jbj: crypto: unhook --nosignatures/--nodigests from a rpmts.
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.39.2.29 -r1.39.2.30 macros.in
--- rpm/macros/macros.in 27 Apr 2012 15:54:51 -0000 1.39.2.29
+++ rpm/macros/macros.in 27 Apr 2012 17:18:03 -0000 1.39.2.30
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.39.2.29 2012/04/27 15:54:51 jbj Exp $
+# $Id: macros.in,v 1.39.2.30 2012/04/27 17:18:03 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
@@ -276,6 +276,17 @@
#%_pgp_name
#%_pgp_path
+#==============================================================================
+# ---- Development macros.
+# (Development) Use at your own risk.
+%__varlibwdj %{_var}/lib/wdj
+%__varcacherpm %{_var}/cache/rpm
+%__varcachewdj %{_var}/cache/wdj
+
+%__gitdir %{__varlibwdj}/git
+%__svndir %{__varlibwdj}/svn
+%__sqldir %{__varlibwdj}/sql
+
# Elements necessary to construct a mongodb:// URI configurably
#
%__mongodb_user luser
@@ -843,14 +854,14 @@
#
# A configuration to build an rpmdb from yum package hierarchy
-%_bhpath file:///var/cache/yum
+%_bhpath file://%{_varcachewdj}
%_bhcoll @(updates)
%_bhN @(packages)
%_bhVR %{nil}
%_bhA %{nil}
# The cache database directory.
-%_cache_dbpath /var/cache/yum/rpmdb
+%_cache_dbpath %{_varcachewdj}/rpmdb
#==============================================================================
# ---- per-platform macros.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.134.2.4 -r1.134.2.5 Makefile.am
--- rpm/rpmdb/Makefile.am 16 Apr 2012 23:43:34 -0000 1.134.2.4
+++ rpm/rpmdb/Makefile.am 27 Apr 2012 17:18:03 -0000 1.134.2.5
@@ -158,11 +158,20 @@
@echo 'int rpmTagTableSize = sizeof(_rpmTagTable) /
sizeof(_rpmTagTable[0]) - 1;' >> $@
varlibrpm = $(varprefix)/lib/rpm
+varlibwdj = $(varprefix)/lib/wdj
+varcachewdj = $(varprefix)/cache/rpm
+varcachewdj = $(varprefix)/cache/wdj
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(varlibrpm)
$(mkinstalldirs) $(DESTDIR)$(varlibrpm)/log
$(mkinstalldirs) $(DESTDIR)$(varlibrpm)/tmp
[ -f $(DESTDIR)$(varlibrpm)/DB_CONFIG ] || $(install_sh_DATA) DB_CONFIG
$(DESTDIR)$(varlibrpm)
+ $(mkinstalldirs) $(DESTDIR)$(varlibwdj)
+ $(mkinstalldirs) $(DESTDIR)$(varlibwdj)/git
+ $(mkinstalldirs) $(DESTDIR)$(varlibwdj)/svn
+ $(mkinstalldirs) $(DESTDIR)$(varlibwdj)/sql
+ $(mkinstalldirs) $(DESTDIR)$(varcacherpm)
+ $(mkinstalldirs) $(DESTDIR)$(varcachewdj)
$(mkinstalldirs) $(DESTDIR)$(pkgincdir)
check-local:
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
