RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Jul-2007 22:14:14
Branch: HEAD Handle: 2007071721141300
Modified files:
rpm CHANGES Makefile.am macros.in
Log:
Use %{_rpmdir}/repackage as the default for %{_repackage_dir} instead of
a hard-coded (Linux-style) /var/spool/repackage.
Summary:
Revision Changes Path
1.1489 +1 -0 rpm/CHANGES
2.194 +1 -0 rpm/Makefile.am
1.182 +2 -2 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1488 -r1.1489 CHANGES
--- rpm/CHANGES 17 Jul 2007 20:07:41 -0000 1.1488
+++ rpm/CHANGES 17 Jul 2007 20:14:13 -0000 1.1489
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - rse: use %{_rpmdir}/repackage as the default for %{_repackage_dir}
instead of a hard-coded /var/spool/repackage
- rse: remove one more hard-coded reference to /etc/rpm/sysinfo with a
macro and SYSCONFIGDIR based approach
- rse: add (partially untested) platform support for AIX, IRIX and Tru64
based on OpenPKG patchset.
- rse: provide an RPM_OS_XXX define for allowing us to compiler
independent check for a platform in the C code
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.193 -r2.194 Makefile.am
--- rpm/Makefile.am 17 Jul 2007 14:57:56 -0000 2.193
+++ rpm/Makefile.am 17 Jul 2007 20:14:13 -0000 2.194
@@ -153,6 +153,7 @@
*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/@host_cpu@ ;;\
esac
$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/noarch
+ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/repackage
.PHONY: setperms
setperms:
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.181 -r1.182 macros.in
--- rpm/macros.in 16 Jul 2007 19:03:03 -0000 1.181
+++ rpm/macros.in 17 Jul 2007 20:14:13 -0000 1.182
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.181 2007/07/16 19:03:03 rse Exp $
+# $Id: macros.in,v 1.182 2007/07/17 20:14:13 rse 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
@@ -847,7 +847,7 @@
# The directory in which erased packages will be saved when using
# the --repackage option.
-%_repackage_dir /var/spool/repackage
+%_repackage_dir %{_rpmdir}/repackage
# A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
%_repackage_root %{nil}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
