X-Git-Url: http://git.pld-linux.org/?p=packages%2Futil-vserver.git;a=blobdiff_plain;f=util-vserver.spec;h=4e44408250b0bf74af454d31736916b4228b51fe;hp=26ea6b8f4c377e46ce675eef4ed48f3c1d2f7342;hb=bd7cf93;hpb=3c5cf5f32990995b4ed626f823d0132d36ca2399 diff --git a/util-vserver.spec b/util-vserver.spec index 26ea6b8..4e44408 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -3,7 +3,7 @@ # - m68k and mips are the only not supported archs # # Conditional build: -%bcond_without dietlibc # don't use dietlibc (ask for troubles) +%bcond_with dietlibc # don't use dietlibc (ask for troubles) %bcond_without doc # don't build documentation which needed LaTeX %bcond_without no_dynamic_context # disable enforcement of disabled dynamic context %bcond_with xalan # use the xalan xslt processor @@ -19,8 +19,8 @@ # reqdb_pkg and reqdb_ver must match value from current rpm package in distro %define reqdb_ver 5.2 %define reqdb_pkg db%{reqdb_ver} -%define snap pre3120 -%define rel 1 +%define snap pre3126 +%define rel 5 Summary: Linux virtual server utilities Summary(pl.UTF-8): Narzędzia dla linuksowych serwerów wirtualnych Name: util-vserver @@ -29,7 +29,7 @@ Release: 1.%{snap}.%{rel} License: GPL Group: Applications/System Source0: http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.xz -# Source0-md5: 5556f5ed07fdca8e0df85826aed7e33f +# Source0-md5: f4bd6e49baf2c6dd50ff0c9b6415a1c2 Source1: vprocunhide.init Source2: vservers.init Source3: vservers-legacy.init @@ -66,7 +66,7 @@ Patch13: %{name}-tmpdir.patch Patch14: %{name}-rpmpath.patch Patch15: %{name}-interfaces-ignore-cvs-dir.patch Patch16: %{name}-personalitymachine.patch -Patch17: h2ext-xz.patch + Patch18: %{name}-vprocunhide-net.patch # http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch Patch19: %{name}-dbrebuild-internalize4.patch @@ -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. @@ -442,7 +444,7 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux. %patch14 -p1 %patch15 -p1 %patch16 -p1 -%patch17 -p1 + %patch18 -p1 %patch19 -p1 %patch21 -p1 @@ -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 @@ -642,7 +646,7 @@ install -d $RPM_BUILD_ROOT/var/cache/vservers/poldek %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_libvserver.la # we have our own initscript which does the same -%{__rm} $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-wrapper +%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/util-vserver/vserver-wrapper %{__rm} $RPM_BUILD_ROOT%{_datadir}/util-vserver/vserver-init.functions %{__rm} $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/vservers.conf @@ -828,49 +832,52 @@ exit 0 %{_libdir}/%{name}/FEATURES.txt %{_libdir}/%{name}/util-vserver-vars %attr(755,root,root) %{_libdir}/%{name}/bash-wrapper -%attr(755,root,root) %{_libdir}/%{name}/capchroot -%attr(755,root,root) %{_libdir}/%{name}/chain-echo -%attr(755,root,root) %{_libdir}/%{name}/chbind-compat -%attr(755,root,root) %{_libdir}/%{name}/chcontext-compat -%attr(755,root,root) %{_libdir}/%{name}/check-unixfile -%attr(755,root,root) %{_libdir}/%{name}/chroot-sh -%attr(755,root,root) %{_libdir}/%{name}/exec-remount -%attr(755,root,root) %{_libdir}/%{name}/exec-ulimit -%attr(755,root,root) %{_libdir}/%{name}/fakerunlevel -%attr(755,root,root) %{_libdir}/%{name}/filetime -%attr(755,root,root) %{_libdir}/%{name}/h2ext -%attr(755,root,root) %{_libdir}/%{name}/h2ext-worker -%attr(755,root,root) %{_libdir}/%{name}/keep-ctx-alive -%attr(755,root,root) %{_libdir}/%{name}/lockfile -%attr(755,root,root) %{_libdir}/%{name}/mask2prefix -%attr(755,root,root) %{_libdir}/%{name}/pkgmgmt -%attr(755,root,root) %{_libdir}/%{name}/readlink +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/util-vserver-vars %attr(755,root,root) %{_libdir}/%{name}/rpm-fake* -%attr(755,root,root) %{_libdir}/%{name}/save_ctxinfo -%attr(755,root,root) %{_libdir}/%{name}/secure-mount -%attr(755,root,root) %{_libdir}/%{name}/sigexec -%attr(755,root,root) %{_libdir}/%{name}/systemd-start -%attr(755,root,root) %{_libdir}/%{name}/systemd-stop -%attr(755,root,root) %{_libdir}/%{name}/start-vservers -%attr(755,root,root) %{_libdir}/%{name}/tunctl -%attr(755,root,root) %{_libdir}/%{name}/vapt-get-worker -%attr(755,root,root) %{_libdir}/%{name}/vclone -%attr(755,root,root) %{_libdir}/%{name}/vcopy -%attr(755,root,root) %{_libdir}/%{name}/vhashify %attr(755,root,root) %{_libdir}/%{name}/vhashify.cron -%attr(755,root,root) %{_libdir}/%{name}/vpkg -%attr(755,root,root) %{_libdir}/%{name}/vpoldek-worker -%attr(755,root,root) %{_libdir}/%{name}/vprocunhide -%attr(755,root,root) %{_libdir}/%{name}/vrpm-* -%attr(755,root,root) %{_libdir}/%{name}/vserver-build -%attr(755,root,root) %{_libdir}/%{name}/vurpm-worker -%attr(755,root,root) %{_libdir}/%{name}/vservers.grabinfo.sh -%attr(755,root,root) %{_libdir}/%{name}/vshelper -%attr(755,root,root) %{_libdir}/%{name}/vshelper-sync -%attr(755,root,root) %{_libdir}/%{name}/vsysctl -%attr(755,root,root) %{_libdir}/%{name}/vsysvwrapper -%attr(755,root,root) %{_libdir}/%{name}/vunify -%attr(755,root,root) %{_libdir}/%{name}/vyum-worker +%attr(755,root,root) %{_libexecdir}/%{name}/capchroot +%attr(755,root,root) %{_libexecdir}/%{name}/chain-echo +%attr(755,root,root) %{_libexecdir}/%{name}/chbind-compat +%attr(755,root,root) %{_libexecdir}/%{name}/chcontext-compat +%attr(755,root,root) %{_libexecdir}/%{name}/check-unixfile +%attr(755,root,root) %{_libexecdir}/%{name}/chroot-sh +%attr(755,root,root) %{_libexecdir}/%{name}/exec-remount +%attr(755,root,root) %{_libexecdir}/%{name}/exec-ulimit +%attr(755,root,root) %{_libexecdir}/%{name}/fakerunlevel +%attr(755,root,root) %{_libexecdir}/%{name}/filetime +%attr(755,root,root) %{_libexecdir}/%{name}/h2ext +%attr(755,root,root) %{_libexecdir}/%{name}/h2ext-worker +%attr(755,root,root) %{_libexecdir}/%{name}/keep-ctx-alive +%attr(755,root,root) %{_libexecdir}/%{name}/lockfile +%attr(755,root,root) %{_libexecdir}/%{name}/mask2prefix +%attr(755,root,root) %{_libexecdir}/%{name}/pkgmgmt +%attr(755,root,root) %{_libexecdir}/%{name}/readlink +%attr(755,root,root) %{_libexecdir}/%{name}/rpm-fake* +%attr(755,root,root) %{_libexecdir}/%{name}/save_ctxinfo +%attr(755,root,root) %{_libexecdir}/%{name}/secure-mount +%attr(755,root,root) %{_libexecdir}/%{name}/sigexec +%attr(755,root,root) %{_libexecdir}/%{name}/start-vservers +%attr(755,root,root) %{_libexecdir}/%{name}/systemd-start +%attr(755,root,root) %{_libexecdir}/%{name}/systemd-stop +%attr(755,root,root) %{_libexecdir}/%{name}/tunctl +%attr(755,root,root) %{_libexecdir}/%{name}/vapt-get-worker +%attr(755,root,root) %{_libexecdir}/%{name}/vclone +%attr(755,root,root) %{_libexecdir}/%{name}/vcopy +%attr(755,root,root) %{_libexecdir}/%{name}/vhashify +%attr(755,root,root) %{_libexecdir}/%{name}/vpkg +%attr(755,root,root) %{_libexecdir}/%{name}/vpoldek-worker +%attr(755,root,root) %{_libexecdir}/%{name}/vprocunhide +%attr(755,root,root) %{_libexecdir}/%{name}/vrpm-* +%attr(755,root,root) %{_libexecdir}/%{name}/vserver-build +%attr(755,root,root) %{_libexecdir}/%{name}/vservers.grabinfo.sh +%attr(755,root,root) %{_libexecdir}/%{name}/vshelper +%attr(755,root,root) %{_libexecdir}/%{name}/vshelper-sync +%attr(755,root,root) %{_libexecdir}/%{name}/vsysctl +%attr(755,root,root) %{_libexecdir}/%{name}/vsysvwrapper +%attr(755,root,root) %{_libexecdir}/%{name}/vunify +%attr(755,root,root) %{_libexecdir}/%{name}/vurpm-worker +%attr(755,root,root) %{_libexecdir}/%{name}/vyum-worker %{_mandir}/man8/chbind.8* %{_mandir}/man8/chcontext.8* %{_mandir}/man8/reducecap.8*