- STUPID. increase release instead. dah

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 902cf67fa1b73f9ab107f252a3294a889f951624..622c7d9e6fa163921b97156e13a70a57947f7779 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -8,27 +8,27 @@
 %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
-#
+
 %define        vproc_version 0.01
 # diet compile fails with ccache in %{__cc}
 %undefine      with_ccache
-#
+
 %ifarch ppc
 # pdflatex: refman: Invalid argument
 %undefine      with_doc
 %endif
-#
-%define                snap    pre2849
-#
+
+%define                snap    pre2883
+%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}.1
+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: af4c22b420320bdd94a1756f3c90de20
+# Source0-md5: 4f7a64b7295ea01673974394f4afd3ff
 Source1:       vprocunhide.init
 Source2:       vservers.init
 Source3:       vservers-legacy.init
@@ -69,10 +69,8 @@ Patch17:     %{name}-backupfiles.patch
 Patch18:       %{name}-vprocunhide-net.patch
 # http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch
 Patch19:       %{name}-dbrebuild-internalize4.patch
-Patch20:       %{name}-dev-stdfd.patch
 Patch21:       %{name}-bash-wrapper.patch
 Patch22:       %{name}-pivot-root-ugly-hack.patch
-Patch23:       %{name}-ac.patch
 Patch24:       vunify-more-exclude.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
@@ -83,18 +81,18 @@ 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
@@ -102,6 +100,7 @@ BuildRequires:      tetex-metafont
 %else
 BuildRequires: texlive-fonts-type1-urw
 BuildRequires: texlive-format-pdflatex
+BuildRequires: texlive-latex-ucs
 BuildRequires: texlive-makeindex
 BuildRequires: texlive-pdftex
 BuildRequires: texlive-xetex
@@ -109,7 +108,7 @@ BuildRequires:      texlive-xetex
 %{?with_xalan:BuildRequires:   xalan-j}
 %endif
 Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name}-lib = %{version}-%{release}
+Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 Requires:      coreutils
 Requires:      diffutils
 Requires:      issue
@@ -117,8 +116,8 @@ Requires:   make
 Requires:      mktemp >= 1.5-18
 Requires:      rc-scripts
 Requires:      tar
-Requires:      util-linux
-Requires:      vserver-distro-pld = %{version}-%{release}
+Requires:      util-linux >= 2.13
+Requires:      vserver-distro-pld = %{epoch}:%{version}-%{release}
 Obsoletes:     util-vserver-build
 Obsoletes:     util-vserver-core
 Obsoletes:     util-vserver-init
@@ -194,7 +193,7 @@ podpakiety util-vserver.
 Summary:       Development files for Linux vserver libraries
 Summary(pl.UTF-8):     Pliki programistyczne dla bibliotek linuksowego vserwera
 Group:         Development/Libraries
-Requires:      %{name}-lib = %{version}-%{release}
+Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 
 %description devel
 This package contains the development files necessary for developing
@@ -208,7 +207,7 @@ programów używających biblioteki vserver.
 Summary:       Static vserver library
 Summary(pl.UTF-8):     Biblioteka statyczna vservera
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 This package contains the static version of vserver library.
@@ -221,7 +220,7 @@ Summary:    Legacy utilities for util-vserver
 Summary(pl.UTF-8):     Stare narzędzia dla util-vserver
 Group:         Applications/System
 Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      rc-scripts
 
 %description legacy
@@ -260,7 +259,7 @@ Pythonowy interfejs do biblioteki libutil-vserver.
 Summary:       VServer build template for Alpine Linux
 Summary(pl.UTF-8):     Szablon budowania VServerów dla dystrybucji Alpine Linux
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description -n vserver-distro-alpine
 VServer build template for Alpine Linux.
@@ -272,8 +271,8 @@ Szablon budowania VServerów dla dystrybucji Alpine Linux.
 Summary:       VServer build template for CentOS
 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:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      vserver-distro-redhat = %{epoch}:%{version}-%{release}
 Requires:      yum
 
 %description -n vserver-distro-centos
@@ -286,7 +285,7 @@ Szablon budowania VServerów dla dystrybucji CentOS 4.2 i 5.
 Summary:       VServer build templates for Debian and Ubuntu
 Summary(pl.UTF-8):     Szablony do tworzenia VServerów dla dystrybucji Debian i Ubuntu
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      debootstrap
 Requires:      dpkg
 Provides:      vserver-distro-ubuntu
@@ -302,11 +301,11 @@ Szablony do tworzenia VServerów dla dystrybucji Debian i Ubuntu.
 Summary:       VServer build templates for Fedora
 Summary(pl.UTF-8):     Szablony do tworzenia VServerów dla dystrybucji Fedora
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      binutils
 Requires:      e2fsprogs
 Requires:      rpm
-Requires:      vserver-distro-redhat = %{version}-%{release}
+Requires:      vserver-distro-redhat = %{epoch}:%{version}-%{release}
 Requires:      wget
 Requires:      yum
 
@@ -321,7 +320,7 @@ Szablony do tworzenia VServerów dla dystrybucji Fedora Core
 Summary:       VServer build template for Gentoo
 Summary(pl.UTF-8):     Szablon budowania VServerów dla Gentoo
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description -n vserver-distro-gentoo
 VServer build template for Gentoo.
@@ -333,7 +332,7 @@ Szablon budowania VServerów dla Gentoo.
 Summary:       VServer build templates for PLD Linux
 Summary(pl.UTF-8):     Szablony do tworzenia VServerów dla dystrybucji PLD Linux
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      /etc/pld-release
 Requires:      poldek >= 0.30
 
@@ -347,7 +346,7 @@ Szablony do tworzenia VServerów dla dystrybucji PLD Linux.
 Summary:       VServer build template for Red Hat Linux 9
 Summary(pl.UTF-8):     Szablon do tworzenia VServerów dla dystrybucji Red Hat Linux 9
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      binutils
 Requires:      e2fsprogs
 Requires:      rpm
@@ -363,7 +362,7 @@ Szablon do tworzenia VServerów dla dystrybucji Red Hat Linux 9.
 Summary:       VServer build template for SuSE 9.1
 Summary(pl.UTF-8):     Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      binutils
 Requires:      e2fsprogs
 Requires:      rpm
@@ -396,10 +395,8 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p0
 %patch24 -p1
 
 install %{SOURCE9} package-management.txt
@@ -420,17 +417,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}
@@ -486,7 +489,8 @@ ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/ini
 ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/initpost
 %endif
 install vproc-%{vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
-install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
+sed -e 's,/usr/lib,%{_libdir},' %{SOURCE12} > $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
 
 cat > $RPM_BUILD_ROOT/etc/cron.d/vservers << EOF
 02 2 * * 0      root    %{_libdir}/%{name}/vhashify.cron
@@ -655,7 +659,7 @@ exit 0
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS THANKS doc/intro.txt
-%doc contrib/yum*.patch package-management.txt
+%doc package-management.txt
 %{?with_doc:%doc doc/*.html}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vrootdevices
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers
@@ -835,6 +839,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)
@@ -853,6 +858,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)