- rel 3; R texlive-fonts-rsfs

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 7ad0325396bcd476468fe6ae0506258046bce434..5af4e6c8d7b0ce5daf2f72108b8005184b9ca91c 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,17 +18,17 @@
 %undefine      with_doc
 %endif
 
-%define                snap    pre2864
-%define                rel             1
+%define                snap    pre2926
+%define                rel     3
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
 Version:       0.30.216
-Release:       0.%{snap}.%{rel}
+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: f686d72b39399fba96bbabd7debab549
+# Source0-md5: 236c0ef54b94f8c116afaf7b78396a58
 Source1:       vprocunhide.init
 Source2:       vservers.init
 Source3:       vservers-legacy.init
@@ -72,6 +72,8 @@ Patch19:      %{name}-dbrebuild-internalize4.patch
 Patch21:       %{name}-bash-wrapper.patch
 Patch22:       %{name}-pivot-root-ugly-hack.patch
 Patch24:       vunify-more-exclude.patch
+Patch25:       stat.patch
+Patch26:       %{name}-usersystime.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.9
@@ -81,25 +83,27 @@ BuildRequires:      ctags
 BuildRequires: e2fsprogs-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 1.5.14
-%ifarch %{x8664}
-BuildRequires: sed >= 4.0
-%endif
+BuildRequires: pkgconfig
 BuildRequires: python-devel
+BuildRequires: python-modules
+BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sed >= 4.0
 %if %{with doc}
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: libxslt-progs
 BuildRequires: python-devel
-BuildRequires: rpm-pythonprov
-%if "%{pld_release}" == "ti"
+%if "%{pld_release}" != "th"
 BuildRequires: tetex-fonts-jknappen
 BuildRequires: tetex-format-pdflatex
 BuildRequires: tetex-makeindex
 BuildRequires: tetex-metafont
 %else
+BuildRequires: texlive-fonts-rsfs
 BuildRequires: texlive-fonts-type1-urw
 BuildRequires: texlive-format-pdflatex
+BuildRequires: texlive-latex-ucs
 BuildRequires: texlive-makeindex
 BuildRequires: texlive-pdftex
 BuildRequires: texlive-xetex
@@ -113,9 +117,9 @@ Requires:   diffutils
 Requires:      issue
 Requires:      make
 Requires:      mktemp >= 1.5-18
-Requires:      rc-scripts
+Requires:      rc-scripts >= 0.4.3.4
 Requires:      tar
-Requires:      util-linux
+Requires:      util-linux >= 2.13
 Requires:      vserver-distro-pld = %{version}-%{release}
 Obsoletes:     util-vserver-build
 Obsoletes:     util-vserver-core
@@ -397,6 +401,8 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 %patch21 -p1
 %patch22 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -416,17 +422,23 @@ 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 \
-       MKTEMP=/bin/mktemp \
-       MOUNT=/bin/mount \
-       PS=/bin/ps \
-       UMOUNT=/bin/umount \
+       FSCK=/sbin/fsck \
+       IONICE=%{_usrbin}/ionice \
        IP=/sbin/ip \
        IPTABLES=%{_usrsbin}/iptables \
+       MKTEMP=/bin/mktemp \
        MODPROBE=/sbin/modprobe \
+       MOUNT=/bin/mount \
        NAMEIF=/sbin/nameif \
+       PS=/bin/ps \
+       RESTORE=/sbin/restore \
        RMMOD=/sbin/rmmod \
+       RSYNC=%{_usrbin}/rsync \
+       STRACE=%{_usrbin}/strace \
+       UMOUNT=/bin/umount \
        VCONFIG=/sbin/vconfig \
        WGET=%{_usrbin}/wget \
+# end
 
 %{__make} all
 %{?with_doc:%{__make} doc}
@@ -832,6 +844,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
 
 %files -n vserver-distro-alpine
 %defattr(644,root,root,755)
@@ -850,6 +863,7 @@ exit 0
 %{_libdir}/%{name}/distributions/etch
 %{_libdir}/%{name}/distributions/lenny
 %{_libdir}/%{name}/distributions/sid
+%{_libdir}/%{name}/distributions/squeeze
 
 %files -n vserver-distro-fedora
 %defattr(644,root,root,755)
@@ -864,6 +878,8 @@ exit 0
 %{_libdir}/%{name}/distributions/f9
 %{_libdir}/%{name}/distributions/f10
 %{_libdir}/%{name}/distributions/f11
+%{_libdir}/%{name}/distributions/f12
+%{_libdir}/%{name}/distributions/f13
 %{_libdir}/%{name}/distributions/fc1
 %{_libdir}/%{name}/distributions/fc2
 %{_libdir}/%{name}/distributions/fc3