- rel 2; build with glibc, so it will also work on systems with newer kernels that...

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 1129bbb6ed16abe99bda4697bae95e2a588f5a78..5ef9169605cb25a29bb269f25589388b0a1cee0e 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,8 +1,9 @@
+# TODO: verify systemd files
 # NOTE:
 # - 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
@@ -18,7 +19,7 @@
 # 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    pre3054
+%define                snap    pre3126
 %define                rel     2
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
@@ -27,8 +28,8 @@ Version:      0.30.216
 Release:       1.%{snap}.%{rel}
 License:       GPL
 Group:         Applications/System
-Source0:       http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5: d6fe16a0dbde811ae0672ca69aaf01c5
+Source0:       http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.xz
+# Source0-md5: f4bd6e49baf2c6dd50ff0c9b6415a1c2
 Source1:       vprocunhide.init
 Source2:       vservers.init
 Source3:       vservers-legacy.init
@@ -49,7 +50,6 @@ Source13:     ftp://ftp.pld-linux.org/dists/ac/PLD-2.0-Ac-GPG-key.asc
 Source14:      ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 # Source14-md5:        08b29584dd349aac9caa7610131a0a88
 Source15:      %{name}.init
-Source16:      %{name}.tmpfiles
 Patch0:                %{name}-vsysvwrapper.patch
 Patch1:                %{name}-pld.patch
 Patch2:                %{name}-centos.patch
@@ -57,7 +57,6 @@ Patch3:               %{name}-tld.patch
 Patch4:                %{name}-m4-diet.patch
 Patch5:                %{name}-yum-verb-nogpg.patch
 Patch6:                %{name}-build-umask.patch
-Patch7:                %{name}-utmpx.patch
 Patch8:                %{name}-vprocunhide.patch
 Patch9:                %{name}-dev.patch
 Patch10:       %{name}-no-dynamic-ctx.patch
@@ -67,7 +66,7 @@ Patch13:      %{name}-tmpdir.patch
 Patch14:       %{name}-rpmpath.patch
 Patch15:       %{name}-interfaces-ignore-cvs-dir.patch
 Patch16:       %{name}-personalitymachine.patch
-Patch17:       %{name}-backupfiles.patch
+
 Patch18:       %{name}-vprocunhide-net.patch
 # http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch
 Patch19:       %{name}-dbrebuild-internalize4.patch
@@ -81,20 +80,23 @@ Patch28:    diet-ccache.patch
 Patch29:       %{name}-centos6.patch
 Patch30:       vsysctl-ignore-files.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
-BuildRequires: autoconf
-BuildRequires: automake >= 1.9
+BuildRequires: autoconf >= 2.57
+BuildRequires: automake >= 1:1.9
 BuildRequires: beecrypt-devel
 BuildRequires: ctags
-%{?with_dietlibc:BuildRequires:        dietlibc-static >= 2:0.32-16}
+%{?with_dietlibc:BuildRequires:        dietlibc-static >= 2:0.33-4}
 BuildRequires: e2fsprogs-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 1.5.14
 BuildRequires: pkgconfig
-BuildRequires: python-devel
-BuildRequires: python-modules
+BuildRequires: python-devel >= 1:2.4
+BuildRequires: python-modules >= 1:2.4
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.647
 BuildRequires: sed >= 4.0
+BuildRequires: systemd-devel
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 %if %{with doc}
 BuildRequires: doxygen >= 1:1.7.3
 BuildRequires: graphviz
@@ -112,6 +114,7 @@ BuildRequires:      texlive-format-pdflatex
 BuildRequires: texlive-latex-ams
 BuildRequires: texlive-latex-extend
 BuildRequires: texlive-latex-ucs
+BuildRequires: texlive-latex-wasysym
 BuildRequires: texlive-makeindex
 BuildRequires: texlive-pdftex
 BuildRequires: texlive-xetex
@@ -122,9 +125,11 @@ Requires(post,preun):      /sbin/chkconfig
 Requires:      %{name}-lib = %{version}-%{release}
 Requires:      coreutils
 Requires:      diffutils
-Requires:      pld-release
+Requires:      glibc-misc
 Requires:      make
 Requires:      mktemp >= 1.5-18
+Requires:      mount
+Requires:      pld-release
 Requires:      rc-scripts >= 0.4.3.4
 #Requires:     rpm >= 5.4.10-36
 Requires:      tar
@@ -132,6 +137,7 @@ Requires:   uname(release) >= 2.6.27
 Requires:      util-linux >= 2.13
 Requires:      vserver-distro-pld = %{version}-%{release}
 Suggests:      %{reqdb_pkg}-utils
+Suggests:      crondaemon
 Obsoletes:     util-vserver-build
 Obsoletes:     util-vserver-core
 Obsoletes:     util-vserver-init
@@ -427,7 +433,6 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %{?with_no_dynamic_context:%patch10 -p1}
@@ -437,7 +442,7 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
+
 %patch18 -p1
 %patch19 -p1
 %patch21 -p1
@@ -512,6 +517,12 @@ install -d $RPM_BUILD_ROOT{/vservers/.pkg,/etc/{sysconfig,rc.d/init.d,cron.d}} \
 %endif
        DESTDIR=$RPM_BUILD_ROOT
 
+%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
+%endif
+
 # our libcgroup uses per subsystem mount
 touch $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/cgroup/per-ss
 
@@ -540,11 +551,11 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy
 %else
-rm $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
-rm $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
-rm $RPM_BUILD_ROOT%{_mandir}/man8/distrib-info.8
-rm $RPM_BUILD_ROOT%{_mandir}/man8/rebootmgr.8
-rm $RPM_BUILD_ROOT%{_mandir}/man8/vserver-copy.8
+%{__rm} $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
+%{__rm} $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/distrib-info.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/rebootmgr.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vserver-copy.8
 %endif
 
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vrootdevices
@@ -568,7 +579,7 @@ cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/%{name}/distributions/pld-ac/pubkey
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/distributions/pld-th/pubkeys
 cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/%{name}/distributions/pld-th/pubkeys/pld-th.asc
 
-cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+%{__mv} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/{90-util-vserver,util-vserver}.conf
 
 # set arch for pld-ac in pld.conf
 %ifarch i586 i686 ppc sparc alpha athlon
@@ -624,10 +635,14 @@ echo "http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.55_al
 
 install -d $RPM_BUILD_ROOT/var/cache/vservers/poldek
 
-# cleanups
+# python packaging
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
 %{__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
@@ -748,7 +763,7 @@ exit 0
 %dir %{_sysconfdir}/vservers/.distributions
 %dir %{_sysconfdir}/vservers/.distributions/.common
 %dir %{_sysconfdir}/vservers/.distributions/.common/pubkeys
-/sbin/vshelper
+%attr(755,root,root) /sbin/vshelper
 %attr(755,root,root) %{_sbindir}/chbind
 %attr(755,root,root) %{_sbindir}/chcontext
 %attr(755,root,root) %{_sbindir}/chxid
@@ -804,55 +819,61 @@ exit 0
 %dir %{_datadir}/%{name}/distributions/template
 %attr(755,root,root) %{_datadir}/%{name}/distributions/template/initpost
 %attr(755,root,root) %{_datadir}/%{name}/distributions/template/initpre
-%{_datadir}/%{name}/FEATURES.txt
 %{_datadir}/%{name}/util-vserver-vars
 %{_datadir}/%{name}/functions
 %{_datadir}/%{name}/vserver-build.*
 %{_datadir}/%{name}/vserver-setup.functions
 %{_datadir}/%{name}/vserver.*
 %dir %{_libdir}/%{name}
+%{_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}/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*
@@ -862,9 +883,16 @@ exit 0
 %{_mandir}/man8/vserver-stat.8*
 %{_mandir}/man8/vserver.8*
 %{_mandir}/man8/vtop.8*
+%attr(755,root,root) /lib/systemd/system-generators/systemd-vserver-generator
+%{systemdunitdir}/util-vserver.service
+%{systemdunitdir}/vprocunhide.service
+%{systemdunitdir}/vserver.target
+%{systemdunitdir}/vserver-mark@.target
+%{systemdunitdir}/vserver@.service
+%{_prefix}/lib/sysctl.d/90-util-vserver.conf
+%{systemdtmpfilesdir}/%{name}.conf
 %attr(000,root,root) %dir /vservers
 %dir /vservers/.pkg
-%{systemdtmpfilesdir}/%{name}.conf
 %dir %{_localstatedir}/run/vservers
 %dir %{_localstatedir}/run/vservers.rev
 %dir %{_localstatedir}/run/vshelper
@@ -880,9 +908,9 @@ exit 0
 %defattr(644,root,root,755)
 %{?with_doc:%doc lib/apidoc/latex/refman.pdf lib/apidoc/html}
 %attr(755,root,root) %{_libdir}/libvserver.so
-%{_libdir}/lib*.la
-%{_includedir}/vserver*.h
-%{_pkgconfigdir}/*.pc
+%{_libdir}/libvserver.la
+%{_includedir}/vserver.h
+%{_pkgconfigdir}/util-vserver.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -892,12 +920,26 @@ exit 0
 %files legacy
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/vservices
-%{_sysconfdir}/vservices/*
+%{_sysconfdir}/vservices/gated
+%{_sysconfdir}/vservices/httpd
+%{_sysconfdir}/vservices/named
+%{_sysconfdir}/vservices/portmap
+%{_sysconfdir}/vservices/sendmail
+%{_sysconfdir}/vservices/smb
+%{_sysconfdir}/vservices/sshd
+%{_sysconfdir}/vservices/xinetd
 %dir %{_libdir}/%{name}/legacy
 %attr(755,root,root) %{_libdir}/%{name}/legacy/*
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers-legacy
-%attr(754,root,root) /etc/rc.d/init.d/v_*
 %attr(754,root,root) /etc/rc.d/init.d/rebootmgr
+%attr(754,root,root) /etc/rc.d/init.d/v_gated
+%attr(754,root,root) /etc/rc.d/init.d/v_httpd
+%attr(754,root,root) /etc/rc.d/init.d/v_named
+%attr(754,root,root) /etc/rc.d/init.d/v_portmap
+%attr(754,root,root) /etc/rc.d/init.d/v_sendmail
+%attr(754,root,root) /etc/rc.d/init.d/v_smb
+%attr(754,root,root) /etc/rc.d/init.d/v_sshd
+%attr(754,root,root) /etc/rc.d/init.d/v_xinetd
 %attr(754,root,root) /etc/rc.d/init.d/vservers-legacy
 %attr(755,root,root) %{_sbindir}/vserver-copy
 %{_mandir}/man8/distrib-info.8*
@@ -908,7 +950,7 @@ exit 0
 %files -n python-util-vserver
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_libvserver.so
-%{py_sitedir}/libvserver.py
+%{py_sitedir}/libvserver.py[co]
 
 %files -n vserver-distro-alpine
 %defattr(644,root,root,755)