[vzctl] spec: update to 4.4, update changelog, fix patches

[Andrey Vagin]

commit 830c2d5b5e096d98294c85b8413d84783c11307c
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Fri Jul 19 21:04:39 2013 +0400

    spec: update to 4.4, update changelog, fix patches
    
    Update source to 4.4. Update changelog ( we don't use long changelog when we have
    web page ). Drop one of patches ( it's already in sources ).
    Update patch for new version.
    Bad idea to disable SELinux and edit sysctl. For selinux we should create policy
    and we do it. Now also we have "known issues" with note for SELinux. But I've updated
    wiki page with notes of new script ( %{_scriptdir}/vz-postinstall ).
    
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>

 ...tion-on-architectures-without-support-for.patch |   29 --------------------
 ...-values-of-LOCAL_-ID-to-zero-until-userns.patch |   15 ++++++----
 vzctl.spec                                         |   20 +++++++++----
 3 files changed, 23 insertions(+), 41 deletions(-)
---
diff --git a/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch
index ca6006b..f71200c 100644
--- a/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch
+++ b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch
@@ -1,19 +1,22 @@
-From 7af15c352fc0603fe0e854c289152474f8e4553a Mon Sep 17 00:00:00 2001
+From 40971d96e42bd03183f822496ad1aa646d8570c4 Mon Sep 17 00:00:00 2001
 From: Andrey Vagin <avagin at openvz.org>
-Date: Wed, 5 Jun 2013 23:17:21 +0400
-Subject: [PATCH] Set default values of LOCAL_*ID to zero until userns is enabled
+Date: Sat, 20 Jul 2013 08:34:26 +0400
+Subject: [PATCH] Set default values of LOCAL_*ID to zero until userns is
+ enabled
 
+* Sat Jul 20 2013 Igor Gnatenko updated patch for 4.4
 
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
 Signed-off-by: Andrey Vagin <avagin at openvz.org>
 ---
  etc/vz.conf.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/etc/vz.conf.in b/etc/vz.conf.in
-index de240ac..cdb3bd2 100644
+index bf20c9a..684e08a 100644
 --- a/etc/vz.conf.in
 +++ b/etc/vz.conf.in
-@@ -40,8 +40,8 @@ DEF_OSTEMPLATE="centos-5"
+@@ -43,8 +43,8 @@ NAMESERVER=inherit # Copy from host system's /etc/resolv.conf
  #VE_LAYOUT=ploop
  
  # User namespace configuration
@@ -25,5 +28,5 @@ index de240ac..cdb3bd2 100644
  ## Load vzwdog module
  VZWDOG="no"
 -- 
-1.8.2
+1.8.3.1
 
diff --git a/vzctl.spec b/vzctl.spec
index babc951..7dc86c8 100644
--- a/vzctl.spec
+++ b/vzctl.spec
@@ -23,14 +23,13 @@
 
 Summary: OpenVZ containers control utility
 Name: vzctl
-Version: 4.3.1
-%define rel 3
+Version: 4.4
+%define rel 1
 Release: %{rel}%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0: 0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch
-Patch1: 0001-Fix-compilation-on-architectures-without-support-for.patch
 URL: http://openvz.org/
 
 # OpenVZ can run on its own kernel, and if that it is the case, some more
@@ -46,7 +45,7 @@ Requires: crtools
 Requires: gawk
 Requires: sed
 Requires: grep
-# requires for bash_completion and vps-download
+# requires for bash_completion and vztmpl-dl
 Requires: wget
 Requires: bridge-utils
 Requires: gnupg
@@ -64,7 +63,6 @@ i.e. create, start, shutdown, set various options and limits etc.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 CFLAGS="%{optflags}" %configure \
@@ -158,6 +156,7 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8
 %{_libdir}/libvzctl-*.so
 %{_libdir}/libvzchown*.so
 %{_sbindir}/vzctl
+%{_sbindir}/vztmpl-dl
 %{_sbindir}/arpsend
 %{_sbindir}/ndsend
 
@@ -165,6 +164,7 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8
 %{_distscriptdir}/functions
 
 %{_mandir}/man8/vzctl.8.*
+%{_mandir}/man8/vztmpl-dl.8.*
 %{_mandir}/man8/arpsend.8.*
 %{_mandir}/man8/ndsend.8.*
 %{_mandir}/man5/ctid.conf.5.*
@@ -176,11 +176,12 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8
 %{_scriptdir}/vps-netns_dev_add
 %{_scriptdir}/vps-netns_dev_del
 %{_scriptdir}/vps-create
-%{_scriptdir}/vps-download
+%{_scriptdir}/vz-postinstall
 %{_scriptdir}/vps-pci
 %{_scriptdir}/vps-cpt
 %{_scriptdir}/vps-rst
 %{_scriptdir}/vps-rst-env
+%{_scriptdir}/vz-postinstall
 
 %{_configdir}/conf
 %config %{_sysconfdir}/sysconfig/vz
@@ -204,6 +205,13 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8
 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample
 
 %changelog
+* Fri Jul 19 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 4.4-1
+- Update to 4.4 ( changelog: http://openvz.org/Download/vzctl/4.4/changes )
+- fix spec: macros instead of bash variables
+- fix spec: add crtools as requirements
+- fix spec: drop bash from requirements (rpm automatically picks up /bin/sh)
+- fix spec: other fixes
+
 * Fri Jun 7 2013 Andrey Vagin <avagin at gmail.com> - 4.3.1-3
 - Fix compilation on architectures without support for VZ (rhbz 971821)