Sanity.

CVS patchset: 2577
CVS date: 1998/12/02 21:10:18

diff --git a/macros.in b/macros.in
index e6f4962..3c5081a 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -79,18 +79,18 @@
 #      Macro(s) similar to those used by configure.
 #
 %_prefix               @prefix@
-%_build                        @build@
-%_build_alias          @build_alias@
-%_build_cpu            @build_cpu@
-%_build_vendor         @build_vendor@
-%_build_os             @build_os@
+%_build                        %{_host}
+%_build_alias          %{_host_alias}
+%_build_cpu            %{_host_cpu}
+%_build_vendor         %{_host_vendor}
+%_build_os             %{_host_os}
 %_host                 @host@
 %_host_alias           @host_alias@
 %_host_cpu             @host_cpu@
 %_host_vendor          @host_vendor@
 %_host_os              @host_os@
-%_target               @target@
-%_target_alias         @target_alias@
-%_target_cpu           @target_cpu@
-%_target_vendor                @target_vendor@
-%_target_os            @target_os@
+%_target               %{_host}
+%_target_alias         %{_host_alias)
+%_target_cpu           %{_host_cpu)
+%_target_vendor                %{_host_vendor)
+%_target_os            %{_host_os)

diff --git a/rpm.spec b/rpm.spec
index 9972aab..328ae2e 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: Red Hat Package Manager
 Name: rpm
 %define version 2.90
 Version: %{version}
-Release: 2
+Release: 3
 Group: Utilities/System
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/rpm-%{version}.tar.gz
 Copyright: GPL

diff --git a/tests/macros.in b/tests/macros.in
index 378a276..63de2f4 100644 (file)
--- a/tests/macros.in
+++ b/tests/macros.in
@@ -79,18 +79,18 @@
 #      Macro(s) similar to those used by configure.
 #
 %_prefix               @prefix@
-%_build                        @build@
-%_build_alias          @build_alias@
-%_build_cpu            @build_cpu@
-%_build_vendor         @build_vendor@
-%_build_os             @build_os@
+%_build                        %{_host}
+%_build_alias          %{_host_alias}
+%_build_cpu            %{_host_cpu}
+%_build_vendor         %{_host_vendor}
+%_build_os             %{_host_os}
 %_host                 @host@
 %_host_alias           @host_alias@
 %_host_cpu             @host_cpu@
 %_host_vendor          @host_vendor@
 %_host_os              @host_os@
-%_target               @target@
-%_target_alias         @target_alias@
-%_target_cpu           @target_cpu@
-%_target_vendor                @target_vendor@
-%_target_os            @target_os@
+%_target               %{_host}
+%_target_alias         %{_host_alias)
+%_target_cpu           %{_host_cpu)
+%_target_vendor                %{_host_vendor)
+%_target_os            %{_host_os)