SPECS: util-vserver.spec - detect arch name and when is amd64 - us...

[undefine]

Author: undefine                     Date: Sat Mar  1 13:16:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- detect arch name and when is amd64 - use amd64 not x8664 (allow build and use on ac)

---- Files affected:
SPECS:
   util-vserver.spec (1.169 -> 1.170) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.169 SPECS/util-vserver.spec:1.170
--- SPECS/util-vserver.spec:1.169	Mon Dec 31 15:20:21 2007
+++ SPECS/util-vserver.spec	Sat Mar  1 14:16:17 2008
@@ -358,6 +358,12 @@
 %description -n vserver-distro-ubuntu -l pl.UTF-8
 Szablony do tworzenia VServerów dla dystrybucji Ubuntu.
 
+%ifarch amd64
+%define _x8664name amd64
+%else
+%define _x8664name x86_64
+%endif
+
 %prep
 %setup -q -a11
 %patch0 -p1
@@ -462,7 +468,7 @@
 echo "i686-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac-i686/rpm/platform
 cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac \
         $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686
-sed -i 's/x86_64/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/*.conf
+sed -i 's/%{_x8664name}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/*.conf
 
 # th i686
 cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th \
@@ -471,7 +477,7 @@
 echo "i686-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th-i686/rpm/platform
 cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th \
 	$RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686
-sed -i 's/x86_64/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/*.conf
+sed -i 's/%{_x8664name}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/*.conf
 
 # titanium i686
 cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti \
@@ -480,7 +486,7 @@
 echo "i686-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti-i686/rpm/platform
 cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti \
 	$RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686
-sed -i 's/x86_64/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/*.conf
+sed -i 's/%{_x8664name}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/*.conf
 
 # ac x86_64
 sed -i 's/^glibc$/glibc64/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pkgs/01
@@ -815,6 +821,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170  2008-03-01 13:16:17  undefine
+- detect arch name and when is amd64 - use amd64 not x8664 (allow build and use on ac)
+
 Revision 1.169  2007-12-31 14:20:21  glen
 - fix ubuntu and debian pl charset
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/util-vserver.spec?r1=1.169&r2=1.170&f=u