X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=c7372644a286f9d4093605ef597783e2fa393e6f;hb=6cde8bb79b9b0453a71a8f4859a8f373f3357e75;hp=574c180c62938e385b8c47103a46408be072dcad;hpb=08426a598b8f319a85ff1bf718f539469cd693a7;p=util-vserver.git diff --git a/util-vserver.spec b/util-vserver.spec index 574c180..c737264 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -18,11 +18,12 @@ %global _localstatedir %_var %global fullver 0.30.216-pre2883 +%global modulever 0.30.216 %global ver %( echo %fullver | sed 's/-.*//' ) %global subver %( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} ) # for module-tools -%global module_version_varname fullver +%global module_version_varname modulever %global taglevel 0 %{!?release_func:%global release_func() %1%{?dist}} @@ -36,6 +37,7 @@ Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2 #Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2.asc +Patch1: f12.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -49,7 +51,7 @@ BuildRequires: e2fsprogs-devel e2fsprogs %{!?_without_beecrypt:BuildRequires: beecrypt-devel} %{?_without_beecrypt:BuildRequires: nss-devel} BuildRequires: e2fsprogs -#%%{!?_without_doc:BuildRequires: doxygen tetex-latex} +%{!?_without_doc:BuildRequires: doxygen tetex-latex} %{!?_without_python:BuildRequires: python python-devel ctags} Requires(post): %name-core Requires(pre): %pkglibdir @@ -193,7 +195,8 @@ Linux-VServer API from Python. %prep %setup -q -n %name-%fullver - +%patch1 -p0 +autoreconf -fi %build %configure --with-initrddir=%_initrddir --enable-release \ @@ -203,7 +206,7 @@ Linux-VServer API from Python. %{?_without_python:--without-python} %__make %{?_smp_mflags} all -#%%{!?_without_doc:%__make %{?_smp_mflags} doc} +%{!?_without_doc:%__make %{?_smp_mflags} doc} %install @@ -381,8 +384,8 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %files devel -f %name-devel.list %defattr(-,root,root,-) -#%%{!?_without_doc:%doc lib/apidoc/latex/refman.pdf} -#%%{!?_without_doc:%doc lib/apidoc/html} +%{!?_without_doc:%doc lib/apidoc/latex/refman.pdf} +%{!?_without_doc:%doc lib/apidoc/html} %files python