switch to 64-bit variables (2)
Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml
index d724957..11c2ed6 100644
--- a/releng.wtpbuilder/scripts/dependency/template.xml
+++ b/releng.wtpbuilder/scripts/dependency/template.xml
@@ -70,19 +70,19 @@
<isset property="@dependencyGroupId@file"/>
<not>
<or>
- <isset property="@dependencyGroupId@file.linux-gtk-x86"/>
- <isset property="@dependencyGroupId@file.linux-gtk-ppc"/>
- <isset property="@dependencyGroupId@file.win32-win32-x86"/>
- <isset property="@dependencyGroupId@file.macosx-carbon-ppc"/>
+ <isset property="@dependencyGroupId@file.linux-gtk-x86_64"/>
+ <isset property="@dependencyGroupId@file.linux-gtk-ppc64"/>
+ <isset property="@dependencyGroupId@file.win32-win32-x86_64"/>
+ <isset property="@dependencyGroupId@file.macosx-cocoa-x86_64"/>
</or>
</not>
</and>
</condition>
<condition
property="dependency.file"
- value="${@dependencyGroupId@file.win32-win32-x86}">
+ value="${@dependencyGroupId@file.win32-win32-x86_64}">
<and>
- <isset property="@dependencyGroupId@file.win32-win32-x86"/>
+ <isset property="@dependencyGroupId@file.win32-win32-x86_64"/>
<equals
arg1="win32"
arg2="${baseos}"/>
@@ -90,15 +90,15 @@
arg1="win32"
arg2="${basews}"/>
<equals
- arg1="x86"
+ arg1="x86_64"
arg2="${basearch}"/>
</and>
</condition>
<condition
property="dependency.file"
- value="${@dependencyGroupId@file.linux-gtk-x86}">
+ value="${@dependencyGroupId@file.linux-gtk-x86_64}">
<and>
- <isset property="@dependencyGroupId@file.linux-gtk-x86"/>
+ <isset property="@dependencyGroupId@file.linux-gtk-x86_64"/>
<equals
arg1="linux"
arg2="${baseos}"/>
@@ -106,15 +106,15 @@
arg1="gtk"
arg2="${basews}"/>
<equals
- arg1="x86"
+ arg1="x86_64"
arg2="${basearch}"/>
</and>
</condition>
<condition
property="dependency.file"
- value="${@dependencyGroupId@file.linux-gtk-ppc}">
+ value="${@dependencyGroupId@file.linux-gtk-ppc64}">
<and>
- <isset property="@dependencyGroupId@file.linux-gtk-ppc"/>
+ <isset property="@dependencyGroupId@file.linux-gtk-ppc64"/>
<equals
arg1="linux"
arg2="${baseos}"/>
@@ -122,23 +122,23 @@
arg1="gtk"
arg2="${basews}"/>
<equals
- arg1="ppc"
+ arg1="ppc64"
arg2="${basearch}"/>
</and>
</condition>
<condition
property="dependency.file"
- value="${@dependencyGroupId@file.macosx-carbon-ppc}">
+ value="${@dependencyGroupId@file.macosx-cocoa-x86_64}">
<and>
- <isset property="@dependencyGroupId@file.macosx-carbon-ppc"/>
+ <isset property="@dependencyGroupId@file.macosx-cocoa-x86_64"/>
<equals
arg1="macosx"
arg2="${baseos}"/>
<equals
- arg1="carbon"
+ arg1="cocoa"
arg2="${basews}"/>
<equals
- arg1="ppc"
+ arg1="x86_64"
arg2="${basearch}"/>
</and>
</condition>