add support for newer GNU config.{guess,script} (required by brain-dead Interix and Tru64)

openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020805
-%define       R_openpkg 20020805
+%define       V_openpkg 20020806
+%define       R_openpkg 20020806
 
 #   the used software versions
 %define       V_rpm     4.0.2
@@ -111,6 +111,8 @@ Source40:     rc.conf
 Source41:     aux.prereq.sh
 Source42:     aux.usrgrp.sh
 Source43:     mkproxyrpm.pl
+Source44:     ftp://ftp.gnu.org/gnu/config/config.guess
+Source45:     ftp://ftp.gnu.org/gnu/config/config.sub
 
 #   build information
 Prefix:       %{l_prefix}
@@ -297,6 +299,24 @@ Provides:     OpenPKG
     ${l_gzip} -dc `SOURCE tar-%{V_tar}.tar.gz`     | ${l_tar} xf -
     ${l_gzip} -dc `SOURCE bash-%{V_bash}.tar.gz`   | ${l_tar} xf -
 
+    #   update config.guess/config.sub
+    cp `SOURCE config.guess` rpm-%{V_rpm}/
+    cp `SOURCE config.sub`   rpm-%{V_rpm}/
+    cp `SOURCE config.guess` rpm-%{V_rpm}/popt/
+    cp `SOURCE config.sub`   rpm-%{V_rpm}/popt/
+    cp `SOURCE config.guess` db-%{V_db}/dist/
+    cp `SOURCE config.sub`   db-%{V_db}/dist/
+    cp `SOURCE config.guess` curl-%{V_curl}/
+    cp `SOURCE config.sub`   curl-%{V_curl}/
+    cp `SOURCE config.guess` make-%{V_make}/
+    cp `SOURCE config.sub`   make-%{V_make}/
+    cp `SOURCE config.guess` patch-%{V_patch}/
+    cp `SOURCE config.sub`   patch-%{V_patch}/
+    cp `SOURCE config.guess` tar-%{V_tar}/
+    cp `SOURCE config.sub`   tar-%{V_tar}/
+    cp `SOURCE config.guess` bash-%{V_bash}/support/
+    cp `SOURCE config.sub`   bash-%{V_bash}/support/
+
     #   bootstrap GNU make tool
     ( cd make-%{V_make}
       CC="${l_cc}" ./configure --disable-nls --disable-largefile
@@ -592,6 +612,12 @@ Provides:     OpenPKG
     cp $shtool $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/shtool
     chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/shtool
 
+    #   install GNU config scripts
+    cp `SOURCE config.guess` $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
+    chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/config.guess
+    cp `SOURCE config.sub` $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
+    chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/config.sub
+
     #   install a few README files
     sed -e "s:@l_prefix@:%{l_prefix}:g" \
         <`SOURCE root.README` \
@@ -730,6 +756,8 @@ Provides:     OpenPKG
     %{l_prefix}/lib/openpkg/rpmx.sh
     %{l_prefix}/lib/openpkg/shtool
     %{l_prefix}/lib/openpkg/tar
+    %{l_prefix}/lib/openpkg/config.guess
+    %{l_prefix}/lib/openpkg/config.sub
     %{l_prefix}/lib/librpmpopt.a
     %{l_prefix}/lib/librpm.a
     %{l_prefix}/lib/librpmbuild.a

openpkg/rpmmacros

@@ -194,6 +194,9 @@
 %ifdef()                 %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
 %ifndef()                %if %{expand:%%{?%{1}:0}%%{!?%{1}:1}}
 
+#   helper macros for creating local copies of GNU config scripts
+%update_config_scripts   %(cp %{l_prefix}/lib/openpkg/config.guess .; cp %{l_prefix}/lib/openpkg/config.sub .)
+
 #   default list of vendor source fetching locations
 %l_fetch_mirror_0        -
 %l_fetch_mirror_1        -