fix: sparc64 per-platform directory shouldn't be sparc64linux.

CVS patchset: 3727
CVS date: 2000/05/13 15:52:38

diff --git a/CHANGES b/CHANGES
index 01ccc5b..0fa33a1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@
        - simplify --last popt alias, date like -qi (bjerrick@easystreet.com).
        - fix: alloca'd memory used outside of scope (alpha segfault).
        - fix: define/eval options assumed sizeof(int) == sizeof(void *).
+       - fix: sparc64 per-platform directory shouldn't be sparc64linux.
        
 3.0.3 -> 3.0.4
        - use compressed filenames on install side.

diff --git a/installplatform b/installplatform
index 566b835..c80df80 100755 (executable)
--- a/installplatform
+++ b/installplatform
@@ -22,7 +22,7 @@ target_platform="`$RPM --eval '%{_target_platform}'`"
 target="`$RPM --eval '%{_target}'`"
 
 case "$arch" in
-  sparc*) SUBSTS="s_sparc64_sparc_ s_sparc[^6]_sparc64_" ;;
+  sparc*) SUBSTS='s_sparc64_sparc_ s_sparc\([^6]\)_sparc64\1_' ;;
   *) SUBSTS=y___ ;;
 esac
 

diff --git a/rpm.spec b/rpm.spec
index 339d2bf..d6720f1 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.1
 Version: %{version}
-Release: 0.17
+Release: 0.18
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL