- BR: doxygen >= 1:1.7.3 as 1.7.2 has bug in latex output

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 622c7d9e6fa163921b97156e13a70a57947f7779..e5bde5688ece01d8ce520bb6bf41f91a05190f21 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,8 +18,8 @@
 %undefine      with_doc
 %endif
 
-%define                snap    pre2883
-%define                rel             3
+%define                snap    pre2926
+%define                rel     6
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
@@ -28,7 +28,7 @@ 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: 4f7a64b7295ea01673974394f4afd3ff
+# 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
@@ -88,7 +90,7 @@ BuildRequires:        rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
 %if %{with doc}
-BuildRequires: doxygen
+BuildRequires: doxygen >= 1:1.7.3
 BuildRequires: graphviz
 BuildRequires: libxslt-progs
 BuildRequires: python-devel
@@ -98,8 +100,10 @@ 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-extend
 BuildRequires: texlive-latex-ucs
 BuildRequires: texlive-makeindex
 BuildRequires: texlive-pdftex
@@ -108,16 +112,16 @@ BuildRequires:    texlive-xetex
 %{?with_xalan:BuildRequires:   xalan-j}
 %endif
 Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
+Requires:      %{name}-lib = %{version}-%{release}
 Requires:      coreutils
 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 >= 2.13
-Requires:      vserver-distro-pld = %{epoch}:%{version}-%{release}
+Requires:      vserver-distro-pld = %{version}-%{release}
 Obsoletes:     util-vserver-build
 Obsoletes:     util-vserver-core
 Obsoletes:     util-vserver-init
@@ -193,7 +197,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 = %{epoch}:%{version}-%{release}
+Requires:      %{name}-lib = %{version}-%{release}
 
 %description devel
 This package contains the development files necessary for developing
@@ -207,7 +211,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 = %{epoch}:%{version}-%{release}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 This package contains the static version of vserver library.
@@ -220,7 +224,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} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      rc-scripts
 
 %description legacy
@@ -259,7 +263,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} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description -n vserver-distro-alpine
 VServer build template for Alpine Linux.
@@ -271,8 +275,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} = %{epoch}:%{version}-%{release}
-Requires:      vserver-distro-redhat = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
+Requires:      vserver-distro-redhat = %{version}-%{release}
 Requires:      yum
 
 %description -n vserver-distro-centos
@@ -285,7 +289,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} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      debootstrap
 Requires:      dpkg
 Provides:      vserver-distro-ubuntu
@@ -301,11 +305,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} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      binutils
 Requires:      e2fsprogs
 Requires:      rpm
-Requires:      vserver-distro-redhat = %{epoch}:%{version}-%{release}
+Requires:      vserver-distro-redhat = %{version}-%{release}
 Requires:      wget
 Requires:      yum
 
@@ -320,7 +324,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} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description -n vserver-distro-gentoo
 VServer build template for Gentoo.
@@ -332,7 +336,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} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      /etc/pld-release
 Requires:      poldek >= 0.30
 
@@ -346,7 +350,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} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      binutils
 Requires:      e2fsprogs
 Requires:      rpm
@@ -362,7 +366,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} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      binutils
 Requires:      e2fsprogs
 Requires:      rpm
@@ -398,6 +402,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
 
@@ -873,6 +879,9 @@ 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/f14
 %{_libdir}/%{name}/distributions/fc1
 %{_libdir}/%{name}/distributions/fc2
 %{_libdir}/%{name}/distributions/fc3