Преглед на файлове

convert to new %{l_platform} world order

Ralf S. Engelschall преди 22 години
родител
ревизия
8f347d4976
променени са 2 файла, в които са добавени 19 реда и са изтрити 19 реда
  1. 10 10
      acroread/acroread.spec
  2. 9 9
      amd/amd.spec

+ 10 - 10
acroread/acroread.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Graphics
 License:      Commercial
 Version:      %{V_real}
-Release:      20030811
+Release:      20030909
 
 #   list of sources
 Source0:      ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/5.x/linux-%{V_comp}.tar.gz
@@ -46,8 +46,8 @@ Source1:      ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/5.x/sol-%{V_comp}
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030516
-PreReq:       OpenPKG, openpkg >= 20030516, X11
+BuildPreReq:  OpenPKG, openpkg >= 20030909
+PreReq:       OpenPKG, openpkg >= 20030909, X11
 AutoReq:      no
 AutoReqProv:  no
 
@@ -69,8 +69,8 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/libexec/acroread
 
     #   unpack the corresponding binary only
-    case "%{l_target}" in
-        ix86-freebsd* )
+    case "%{l_platform -t}" in
+        i?86-freebsd[45]* )
             tarball="%{SOURCE linux-%{V_comp}.tar.gz}"
             shell="/compat/linux/bin/sh"
             if [ ! -f $shell ]; then
@@ -80,15 +80,15 @@ AutoReqProv:  no
                 exit 1
             fi
             ;;
-        ix86-linux* )
+        i?86-linux2* )
             tarball="%{SOURCE linux-%{V_comp}.tar.gz}"
             shell="/bin/sh"
             ;;
-        sparc*-solaris* )
+        sparc*-sunos5* )
             tarball="%{SOURCE sol-%{V_comp}.tar.gz}"
             shell="/bin/sh"
             ;;
-        * ) echo "Platform %{l_target} not supported" | %{l_rpmtool} msg -b
+        * ) echo "Platform %{l_platform -t} not supported" | %{l_rpmtool} msg -b
             exit 1
             ;;
     esac
@@ -109,7 +109,7 @@ AutoReqProv:  no
     %{l_shtool} subst \
         -e "s;$RPM_BUILD_ROOT%{l_prefix}/libexec;%{l_prefix}/libexec;g" \
         $RPM_BUILD_ROOT%{l_prefix}/bin/acroread
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd* )
             %{l_shtool} subst -e 's;#!/bin/sh;#!/compat/linux/bin/sh;' \
                 $RPM_BUILD_ROOT%{l_prefix}/bin/acroread
@@ -133,7 +133,7 @@ AutoReqProv:  no
 
 %post
     if [ $1 -eq 1 ]; then
-        case "%{l_target}" in
+        case "%{l_platform -t}" in
             *-freebsd*)
                 if [ ! -f /compat/linux/bin/sh ]; then
                     ( echo "The Linux ABI base system is not installed under /compat/linux/."

+ 9 - 9
amd/amd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        System
 License:      BSD
 Version:      6.0.9
-Release:      20030801
+Release:      20030909
 
 #   list of sources
 Source0:      ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
@@ -44,8 +44,8 @@ Patch0:       amd.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030718, flex, bison
-PreReq:       OpenPKG, openpkg >= 20030718, perl
+BuildPreReq:  OpenPKG, openpkg >= 20030909, flex, bison
+PreReq:       OpenPKG, openpkg >= 20030909, perl
 AutoReq:      no
 AutoReqProv:  no
 
@@ -71,12 +71,12 @@ AutoReqProv:  no
     %patch -p1
 
 %build
-    case "%{l_target}" in
-    *-netbsd* )
-        %{l_shtool} subst \
-            -e 's;\(!defined(__FreeBSD__)\);(\1 || !defined(__NetBSD__));g' \
-            hlfsd/stubs.c
-        ;;
+    case "%{l_platform -p}" in
+        *-netbsd* )
+            %{l_shtool} subst \
+                -e 's;\(!defined(__FreeBSD__)\);(\1 || !defined(__NetBSD__));g' \
+                hlfsd/stubs.c
+            ;;
     esac
 
     #   disable system LDAP support because it makes trouble (at least under Solaris 9)