- typo

[packages/util-vserver.git] / util-vserver.spec

diff --git a/util-vserver.spec b/util-vserver.spec
index 7fae038decfef2f64ab49eec308c44f45ed322d0..9ea0ab6ffe45d7e9204c192f0443348d26e203dc 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -50,6 +50,8 @@ Patch10:      %{name}-no-dynamic-ctx.patch
 Patch11:       %{name}-more-ip.patch
 Patch12:       %{name}-rpm-fake-resolver-badperm-errorlogging.patch
 Patch13:       %{name}-tmpdir.patch
+Patch14:       %{name}-rpmpath.patch
+Patch15:       %{name}-interfaces-ignore-cvs-dir.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.9
@@ -259,7 +261,7 @@ konfigurację w starym stylu.
 
 %package -n vserver-distro-debian
 Summary:       VServer build templates for Debian
-Summary(pl):   Szablony do tworzenia VServerów dla dystrybucji Debian
+Summary(pl.UTF-8):     Szablony do tworzenia VServerów dla dystrybucji Debian
 Group:         Applications/System
 Requires:      %{name}-build = %{version}-%{release}
 Requires:      dpkg
@@ -267,7 +269,7 @@ Requires:   dpkg
 %description -n vserver-distro-debian
 VServer build templates for Debian.
 
-%description -n vserver-distro-debian -l pl
+%description -n vserver-distro-debian -l pl.UTF-8
 Szablony do tworzenia VServerów dla dystrybucji Debian.
 
 %package -n vserver-distro-centos
@@ -346,7 +348,7 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 
 %package -n vserver-distro-ubuntu
 Summary:       VServer build templates for Ubuntu
-Summary(pl):   Szablony do tworzenia VServerów dla dystrybucji Ubuntu
+Summary(pl.UTF-8):     Szablony do tworzenia VServerów dla dystrybucji Ubuntu
 Group:         Applications/System
 Requires:      %{name}-build = %{version}-%{release}
 Requires:      dpkg
@@ -354,9 +356,15 @@ Requires:  dpkg
 %description -n vserver-distro-ubuntu
 VServer build templates for Ubuntu.
 
-%description -n vserver-distro-ubuntu -l pl
+%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
@@ -370,6 +378,8 @@ Szablony do tworzenia VServerów dla dystrybucji Ubuntu.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -461,7 +471,7 @@ echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name
 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 \
@@ -470,7 +480,7 @@ echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name
 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 \
@@ -479,7 +489,7 @@ echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name
 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