teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame rpm-4.6.0-rc1-defaultdocdir.patch

Panu Matilainen b94c24
commit 927f384a9bc058eb6f954e93cc515cc1293fd2a3
Panu Matilainen b94c24
Author: Panu Matilainen <pmatilai@redhat.com>
Panu Matilainen b94c24
Date:   Fri Oct 17 08:11:10 2008 +0300
Panu Matilainen b94c24
Panu Matilainen b94c24
    Kick out the dumb defaultdocdir logic from installplatform
Panu Matilainen b94c24
    - defaultdocdir is simply %{_datadir}/doc
Panu Matilainen b94c24
Panu Matilainen b94c24
diff --git a/installplatform b/installplatform
Panu Matilainen b94c24
index 8861df0..266d877 100755
Panu Matilainen b94c24
--- a/installplatform
Panu Matilainen b94c24
+++ b/installplatform
Panu Matilainen b94c24
@@ -8,12 +8,6 @@ RPMRC="${1:-rpmrc}"
Panu Matilainen b94c24
 MACROS="${2:-macros}"
Panu Matilainen b94c24
 PLATFORM="${3:-platform}"
Panu Matilainen b94c24
 
Panu Matilainen b94c24
-if grep /share/ $PLATFORM > /dev/null 2>&1 ; then
Panu Matilainen b94c24
-    DEFAULTDOCDIR='%{_usr}/share/doc'
Panu Matilainen b94c24
-else
Panu Matilainen b94c24
-    DEFAULTDOCDIR='%{_usr}/doc'
Panu Matilainen b94c24
-fi
Panu Matilainen b94c24
-
Panu Matilainen b94c24
 TEMPRC="/tmp/rpmrc.$$"
Panu Matilainen b94c24
 cat << E_O_F > $TEMPRC
Panu Matilainen b94c24
 include:	$RPMRC
Panu Matilainen b94c24
@@ -155,7 +149,6 @@ for SUBST in $SUBSTS ; do
Panu Matilainen b94c24
 	-e "s,@RPMRC_GNU@,$RPMRC_GNU," \
Panu Matilainen b94c24
 	-e "s,@LIB@,$LIB," \
Panu Matilainen b94c24
 	-e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
Panu Matilainen b94c24
-	-e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \
Panu Matilainen b94c24
 	-e '/\${\w*:-/!s,\${,%{_,' \
Panu Matilainen b94c24
 	-e "s,@ISANAME@,$ISANAME," \
Panu Matilainen b94c24
 	-e "s,@ISABITS@,$ISABITS," \
Panu Matilainen b94c24
diff --git a/platform.in b/platform.in
Panu Matilainen b94c24
index 4b496a0..9768a8a 100644
Panu Matilainen b94c24
--- a/platform.in
Panu Matilainen b94c24
+++ b/platform.in
Panu Matilainen b94c24
@@ -37,7 +37,7 @@
Panu Matilainen b94c24
 # Deprecated misspelling, present for backwards compatibility.
Panu Matilainen b94c24
 %_initrddir		%{_initddir}
Panu Matilainen b94c24
 
Panu Matilainen b94c24
-%_defaultdocdir		@DEFAULTDOCDIR@
Panu Matilainen b94c24
+%_defaultdocdir		%{_datadir}/doc
Panu Matilainen b94c24
 
Panu Matilainen b94c24
 %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
Panu Matilainen b94c24
 	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\