Use %{_usr} not %{_prefix} for %_defaultdocdir path.

CVS patchset: 3791
CVS date: 2000/06/01 13:43:05

diff --git a/installplatform b/installplatform
index 7bc5277..8dfca14 100755 (executable)
--- a/installplatform
+++ b/installplatform
@@ -8,9 +8,9 @@ MACROS="${2:-macros}"
 PLATFORM="${3:-platform}"
 
 if grep /share/ $PLATFORM > /dev/null 2>&1 ; then
-    DEFAULTDOCDIR='%{_prefix}/share/doc'
+    DEFAULTDOCDIR='%{_usr}/share/doc'
 else
-    DEFAULTDOCDIR='%{_prefix}/doc'
+    DEFAULTDOCDIR='%{_usr}/doc'
 fi
 
 TEMPRC="/tmp/rpmrc.$$"

diff --git a/rpm.spec b/rpm.spec
index 8be9662..3a3f758 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -5,7 +5,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 4.0
 Version: %{version}
-Release: 0.29
+Release: 0.31
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL