summaryrefslogtreecommitdiffstats
path: root/redhat/zebra.spec.in
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/zebra.spec.in')
-rw-r--r--redhat/zebra.spec.in51
1 files changed, 11 insertions, 40 deletions
diff --git a/redhat/zebra.spec.in b/redhat/zebra.spec.in
index 85b3b318..ce3a6fb4 100644
--- a/redhat/zebra.spec.in
+++ b/redhat/zebra.spec.in
@@ -1,4 +1,4 @@
-# configure options
+# conditionals
%define with_snmp 0
%define with_vtysh 1
%define with_ospf_te 1
@@ -11,8 +11,6 @@
%define with_ospfclient 1
%define with_ospfapi 1
%define with_multipath 64
-%define zebra_user zebra
-%define vty_group zebravty
# path defines
%define _sysconfdir /etc/zebra
@@ -24,12 +22,12 @@
%define _libexecdir %{_exec_prefix}/libexec/zebra
%define _includedir %{_prefix}/include/zebra
%define _libdir %{_exec_prefix}/%{_lib}/zebra
-%define _localstatedir /var/run/zebra
+%define _localstatedir %{_prefix}/var/run
Summary: Routing daemon
Name: zebra
Version: @VERSION@
-Release: @CONFDATE@01
+Release: @CONFDATE@
License: GPL
Group: System Environment/Daemons
Source0: ftp://ftp.zebra.org/pub/zebra/%{name}-%{version}.tar.gz
@@ -82,7 +80,10 @@ developing OSPF-API and zebra applications.
%setup -q
%build
+./update-autotools
%configure \
+ --with-cflags="-O2" \
+ --enable-netlink \
%if %with_ipv6
--enable-ipv6 \
%endif
@@ -118,17 +119,12 @@ developing OSPF-API and zebra applications.
--enable-ospfapi=no \
%endif
%if %with_pam
- --with-libpam \
+ --with-libpam
%endif
-%if %zebra_user
- --enable-user=%zebra_user \
- --enable-group=%zebra_user \
-%endif
-%if %vty_group
- --enable-vty-group=%vty_group \
-%endif
---with-cflags="-O2" \
---enable-netlink
+
+pushd vtysh
+make %{?_smp_mflags} rebuild
+popd
make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
@@ -155,18 +151,6 @@ install %{zeb_rh_src}/ospfd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd
install %{zeb_rh_src}/ripd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd
install -m644 %{zeb_rh_src}/zebra.pam $RPM_BUILD_ROOT/etc/pam.d/zebra
install -m644 %{zeb_rh_src}/zebra.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/zebra
-install -d -m750 $RPM_BUILD_ROOT/var/run/zebra
-
-%pre
-# add vty_group
-%if %vty_group
-groupadd -r %vty_group 2> /dev/null || :
-%endif
-# add zebra user and group
-%if %zebra_user
-/usr/sbin/useradd -M -r -s /bin/false -c "Zebra routing suite" \
- -d %_localstatedir %zebra_user 2> /dev/null || :
-%endif
%post
# zebra_spec_add_service <service name> <port/proto> <comment>
@@ -251,19 +235,9 @@ fi
%doc doc/zebra.html
%doc doc/mpls
%doc ChangeLog INSTALL NEWS README REPORTING-BUGS SERVICES TODO
-%if %zebra_user
-%dir %attr(751,%zebra_user,%zebra_user) %{_sysconfdir}
-%dir %attr(750,%zebra_user,%zebra_user) /var/log/zebra
-%dir %attr(751,%zebra_user,%zebra_user) /var/run/zebra
-%else
%dir %attr(750,root,root) %{_sysconfdir}
%dir %attr(750,root,root) /var/log/zebra
%dir %attr(755,root,root) /usr/share/info
-%dir %attr(750,root,root) /var/run/zebra
-%endif
-%if %vty_group
-%attr(750,%zebra_user,%vty_group) %{_sysconfdir}/vtysh.conf.sample
-%endif
%{_infodir}/*info*
%{_mandir}/man*/*
%{_sbindir}/*
@@ -288,9 +262,6 @@ fi
%endif
%changelog
-* Tue Mar 20 2003 Paul Jakma <paul@dishone.st>
-- zebra privileges support
-
* Mon Mar 18 2003 Paul Jakma <paul@dishone.st>
- Fix mem leak in 'show thread cpu'
- Ralph Keller's OSPF-API