- fix sysctl location

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 5ef9169605cb25a29bb269f25589388b0a1cee0e..4e44408250b0bf74af454d31736916b4228b51fe 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     2
+%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
 
@@ -475,6 +478,7 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__"
        --enable-apis=NOLEGACY \
        --with-initscripts=sysv \
        --%{?with_dietlibc:en}%{!?with_dietlibc:dis}able-dietlibc \
+       SYSTEMD_SYSCTLDIR=%{_prefix}/lib/sysctl.d \
        FSCK=/sbin/fsck \
        IONICE=%{_usrbin}/ionice \
        IP=/sbin/ip \
@@ -495,7 +499,7 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__"
 
 %{__make} all
 
-%{?with_doc:%{__make} doc}
+%{?with_doc:%{__make} doc || :}
 
 %{__make} -C vproc-%{vproc_version} \
        CC="%{__cc}" \
@@ -519,8 +523,8 @@ install -d $RPM_BUILD_ROOT{/vservers/.pkg,/etc/{sysconfig,rc.d/init.d,cron.d}} \
 
 %ifarch %{ix86}
 # fix breakage caused by too many substitiutions on x86
-%{__sed} -i -e 's|%{_datadir}/%{name}/sigexec|%{_libdir}/%{name}/sigexec|g' \
-       $RPM_BUILD_ROOT%{_libdir}/%{name}/vshelper
+%{__sed} -i -e 's|%{_datadir}/%{name}/sigexec|%{_libexecdir}/%{name}/sigexec|g' \
+       $RPM_BUILD_ROOT%{_libexecdir}/%{name}/vshelper
 %endif
 
 # our libcgroup uses per subsystem mount