added missing RPM dependencies and updated Linux distro numbers in manual

(Boeing r1869)
This commit is contained in:
ahrenholz 2014-08-04 22:52:38 +00:00
parent 0721a8b67e
commit 1acddd0f4c
2 changed files with 8 additions and 8 deletions

View file

@ -1,13 +1,13 @@
.. |UBUNTUVERSION| replace:: 12.04, 12.10, or 13.04 .. |UBUNTUVERSION| replace:: 12.04 or 14.04
.. |FEDORAVERSION| replace:: 17, 18, or 19 .. |FEDORAVERSION| replace:: 19 or 20
.. |CENTOSVERSION| replace:: 6.x .. |CENTOSVERSION| replace:: 6.x or 7.x
.. |BSDVERSION| replace:: 9.0 .. |BSDVERSION| replace:: 9.0
.. |CORERPM| replace:: 1.fc19.x86_64.rpm .. |CORERPM| replace:: 1.fc20.x86_64.rpm
.. |CORERPM2| replace:: 1.fc19.noarch.rpm .. |CORERPM2| replace:: 1.fc20.noarch.rpm
.. |COREDEB| replace:: 0ubuntu1_precise_amd64.deb .. |COREDEB| replace:: 0ubuntu1_precise_amd64.deb
.. |COREDEB2| replace:: 0ubuntu1_precise_all.deb .. |COREDEB2| replace:: 0ubuntu1_precise_all.deb
@ -19,7 +19,7 @@
.. |APTDEPS2| replace:: tcl8.5 tk8.5 libtk-img .. |APTDEPS2| replace:: tcl8.5 tk8.5 libtk-img
.. |APTDEPS3| replace:: autoconf automake gcc libev-dev make python-dev libreadline-dev pkg-config imagemagick help2man .. |APTDEPS3| replace:: autoconf automake gcc libev-dev make python-dev libreadline-dev pkg-config imagemagick help2man
.. |YUMDEPS| replace:: bash bridge-utils ebtables iproute libev python .. |YUMDEPS| replace:: bash bridge-utils ebtables iproute libev python procps-ng net-tools
.. |YUMDEPS2| replace:: tcl tk tkimg .. |YUMDEPS2| replace:: tcl tk tkimg
.. |YUMDEPS3| replace:: autoconf automake make libev-devel python-devel ImageMagick help2man .. |YUMDEPS3| replace:: autoconf automake make libev-devel python-devel ImageMagick help2man

View file

@ -22,11 +22,11 @@ building virtual networks using Linux network namespace containers and bridging.
%package daemon %package daemon
Summary: Common Open Research Emulator daemon back-end Summary: Common Open Research Emulator daemon back-end
Group: System Tools Group: System Tools
Requires: bash bridge-utils ebtables iproute libev python Requires: bash bridge-utils ebtables iproute libev python procps-ng net-tools
%if %{with_kernel_modules_extra} %if %{with_kernel_modules_extra}
Requires: kernel-modules-extra Requires: kernel-modules-extra
%endif %endif
BuildRequires: make automake autoconf libev-devel python-devel bridge-utils ebtables iproute ImageMagick help2man BuildRequires: make automake autoconf libev-devel python-devel bridge-utils ebtables iproute procps-ng net-tools ImageMagick help2man
Provides: core-daemon Provides: core-daemon
# python-sphinx # python-sphinx
%description daemon %description daemon