SOURCES: rpm-vendor.patch (NEW) - resurrect target_vendor

[arekm]

Author: arekm                        Date: Thu Feb  8 08:47:01 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- resurrect target_vendor

---- Files affected:
SOURCES:
   rpm-vendor.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/rpm-vendor.patch
diff -u /dev/null SOURCES/rpm-vendor.patch:1.1
--- /dev/null	Thu Feb  8 09:47:01 2007
+++ SOURCES/rpm-vendor.patch	Thu Feb  8 09:46:56 2007
@@ -0,0 +1,35 @@
+Index: macros.in
+===================================================================
+RCS file: /cvs/devel/rpm/macros.in,v
+retrieving revision 1.154.2.61
+diff -u -b -B -w -p -r1.154.2.61 macros.in
+--- macros.in	3 Feb 2007 20:02:07 -0000	1.154.2.61
++++ macros.in	4 Feb 2007 06:37:17 -0000
+@@ -928,7 +928,10 @@ print (t)\
+ %_vendor		@RPMCANONVENDOR@
+ %_os			@RPMCANONOS@
+ %_gnu			-gnu
+-%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
++
++%_host_platform		%{_host_cpu}-%{_host_vendor}-%{_host_os}%{?_gnu}
++%_build_platform	%{_build_cpu}-%{_build_vendor}-%{_build_os}%{?_gnu}
++%_target_platform	%{_target_cpu}-%{_target_vendor}-%{_target_os}%{?_gnu}
+ 
+ #
+ # Define a generic value for optflags. Normally overridden by per-target macros.
+Index: lib/rpmrc.c
+===================================================================
+RCS file: /cvs/devel/rpm/lib/rpmrc.c,v
+retrieving revision 2.193.2.27
+diff -u -b -B -w -p -r2.193.2.27 rpmrc.c
+--- lib/rpmrc.c	21 Jan 2007 21:11:46 -0000	2.193.2.27
++++ lib/rpmrc.c	4 Feb 2007 06:37:30 -0000
+@@ -1774,8 +1774,6 @@ static void rpmRebuildTargetVars(const c
+     addMacro(NULL, "_target", NULL, ct, RMIL_RPMRC);
+     delMacro(NULL, "_target_cpu");
+     addMacro(NULL, "_target_cpu", NULL, ca, RMIL_RPMRC);
+-    delMacro(NULL, "_target_vendor");
+-    addMacro(NULL, "_target_vendor", NULL, "unknown", RMIL_RPMRC);
+     delMacro(NULL, "_target_os");
+     addMacro(NULL, "_target_os", NULL, co, RMIL_RPMRC);
+ /*
================================================================