rpms/rpm/devel rpm-4.6.0-rc1-defaultdocdir.patch, 1.2, 1.3 rpm.spec, 1.316, 1.317

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30503

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.6.0-rc1-defaultdocdir.patch 
Log Message:
- add back defaultdocdir patch which hadn't been applied on 4.6.x branch yet


rpm-4.6.0-rc1-defaultdocdir.patch:

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


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- rpm.spec	12 Dec 2008 18:18:30 -0000	1.316
+++ rpm.spec	12 Dec 2008 18:54:23 -0000	1.317
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.1%{?dist}
+Release: 0.%{snapver}.2%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -31,6 +31,7 @@
 Patch2: rpm-4.5.90-gstreamer-provides.patch
 
 # Patches already in upstream
+Patch200: rpm-4.6.0-rc1-defaultdocdir.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -164,6 +165,9 @@
 %patch1 -p1 -b .pkgconfig-path
 %patch2 -p1 -b .gstreamer-prov
 
+# upstream but not on 4.6.x branch yet, oops
+%patch200 -p1 -b .defaultdocdir
+
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
 
@@ -353,6 +357,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Dec 12 2008 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-0.rc3.2
+- add back defaultdocdir patch which hadn't been applied on 4.6.x branch yet
+
 * Fri Dec 12 2008 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-0.rc3.1
 - add dist-tag, rebuild