- rediff patches

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 388b3097d68d2b6ba831fb4946c9da93a04c42ef..0c5fcfda0fba2cbba21df7eb1543a6b930be38c7 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -20,7 +20,7 @@
 %define                reqdb_ver       5.2
 %define                reqdb_pkg       db%{reqdb_ver}
 %define                snap    pre3126
-%define                rel     3
+%define                rel     5
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
@@ -79,6 +79,7 @@ Patch27:      %{name}-rpm5.patch
 Patch28:       diet-ccache.patch
 Patch29:       %{name}-centos6.patch
 Patch30:       vsysctl-ignore-files.patch
+Patch31:       systemd-shared-mounts.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1:1.9
@@ -102,6 +103,7 @@ BuildRequires:      doxygen >= 1:1.7.3
 BuildRequires: graphviz
 BuildRequires: libxslt-progs
 BuildRequires: python-devel
+BuildRequires: tex-latex-adjustbox
 %if "%{pld_release}" != "th"
 BuildRequires: tetex-fonts-jknappen
 BuildRequires: tetex-format-pdflatex
@@ -293,7 +295,7 @@ Summary(pl.UTF-8):  Szablon budowania VServerów dla dystrybucji CentOS
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
 Requires:      vserver-distro-redhat = %{version}-%{release}
-Requires:      yum
+#Requires:     yum
 
 %description -n vserver-distro-centos
 VServer build template for CentOS 4.2 and 5.
@@ -327,7 +329,7 @@ Requires:   e2fsprogs
 Requires:      rpm
 Requires:      vserver-distro-redhat = %{version}-%{release}
 Requires:      wget
-Requires:      yum
+#Requires:     yum
 
 %description -n vserver-distro-fedora
 VServer build templates for Fedora Core 1,2,3,4,5,6 and Fedora 7.
@@ -403,7 +405,7 @@ Requires:   binutils
 Requires:      e2fsprogs
 Requires:      rpm
 Requires:      wget
-Requires:      yum
+#Requires:     yum
 
 %description -n vserver-distro-scientificlinux
 VServer build template for Scientific Linux.
@@ -454,6 +456,7 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 cp -p %{SOURCE9} package-management.txt