Author: gotar Date: Fri Apr 10 00:33:31 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added view_commands and save_history patches,
- added env.d/VTYSH_PAGER,
- sorted files and subpackages (moved isisd to right place)
---- Files affected:
SPECS:
quagga.spec (1.52 -> 1.53)
---- Diffs:
================================================================
Index: SPECS/quagga.spec
diff -u SPECS/quagga.spec:1.52 SPECS/quagga.spec:1.53
--- SPECS/quagga.spec:1.52 Mon Feb 23 23:08:01 2009
+++ SPECS/quagga.spec Fri Apr 10 02:33:26 2009
@@ -38,6 +38,8 @@
Patch5: %{name}-rt-netlink.patch
Patch6: %{name}-largefile.patch
Patch7: %{name}-link.patch
+Patch8: %{name}-view_commands.patch
+Patch9: %{name}-save_history.patch
URL: http://www.quagga.net/
BuildRequires: autoconf >= 2.53
BuildRequires: automake
@@ -113,6 +115,16 @@
Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{version}-%{release}
+%package isisd
+Summary: IS-IS routing daemon
+Summary(pl.UTF-8): Demon routingu IS-IS
+Group: Networking/Daemons
+Requires(post,preun): /sbin/chkconfig
+Requires: %{name} = %{version}-%{release}
+
+%description isisd
+IS-IS routing daemon.
+
%description ospfd
OSPF routing daemon.
@@ -160,16 +172,6 @@
%description ripngd -l pl.UTF-8
Demon obsługi protokołu RIP w sieciach IPv6.
-%package isisd
-Summary: IS-IS routing daemon
-Summary(pl.UTF-8): Demon routingu IS-IS
-Group: Networking/Daemons
-Requires(post,preun): /sbin/chkconfig
-Requires: %{name} = %{version}-%{release}
-
-%description isisd
-IS-IS routing daemon.
-
%package devel
Summary: Header files for quagga libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek quagga
@@ -204,6 +206,8 @@
#%patch5 -p0
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%build
%{__libtoolize}
@@ -237,7 +241,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d,pam.d} \
+install -d $RPM_BUILD_ROOT/etc/{env.d,logrotate.d,pam.d,rc.d/init.d,sysconfig}
\
$RPM_BUILD_ROOT/var/log/{archive,}/%{name} \
$RPM_BUILD_ROOT%{_var}/run/%{name}
@@ -274,6 +278,8 @@
touch
$RPM_BUILD_ROOT%{_sysconfdir}/{vtysh,zebra,bgpd,ospf6d,ospfd,ripd,ripngd,isisd}.conf
+echo '#VTYSH_PAGER="less -F"' > $RPM_BUILD_ROOT/etc/env.d/VTYSH_PAGER
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -299,6 +305,13 @@
fi
%service bgpd restart "bgpd routing daemon"
+%post isisd
+/sbin/chkconfig --add isisd >&2
+if [ ! -s %{_sysconfdir}/isisd.conf ]; then
+ echo "hostname `hostname`" > %{_sysconfdir}/isisd.conf
+fi
+%service isisd restart "IS-IS routing daemon"
+
%post ospfd
/sbin/chkconfig --add ospfd >&2
if [ ! -s %{_sysconfdir}/ospfd.conf ]; then
@@ -327,13 +340,6 @@
fi
%service ripngd restart "ripngd routing daemon"
-%post isisd
-/sbin/chkconfig --add isisd >&2
-if [ ! -s %{_sysconfdir}/isisd.conf ]; then
- echo "hostname `hostname`" > %{_sysconfdir}/isisd.conf
-fi
-%service isisd restart "IS-IS routing daemon"
-
%preun
if [ "$1" = "0" ]; then
%service zebra stop
@@ -346,6 +352,12 @@
/sbin/chkconfig --del bgpd >&2
fi
+%preun isisd
+if [ "$1" = "0" ]; then
+ %service isisd stop
+ /sbin/chkconfig --del isisd >&2
+fi
+
%preun ospfd
if [ "$1" = "0" ]; then
%service ospfd stop
@@ -370,12 +382,6 @@
/sbin/chkconfig --del ripngd >&2
fi
-%preun isisd
-if [ "$1" = "0" ]; then
- %service isisd stop
- /sbin/chkconfig --del isisd >&2
-fi
-
%postun
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir}
>/dev/null 2>&1
if [ "$1" = "0" ]; then
@@ -390,10 +396,12 @@
%{_infodir}/*info*
%{_mandir}/man1/*
%attr(755,root,root) %{_bindir}/*
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/VTYSH_PAGER
+%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root)
/etc/logrotate.d/zebra
+%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/zebra
%dir %attr(770,root,quagga) %{_sysconfdir}
%config(noreplace) %verify(not md5 mtime size) %attr(660,root,quagga)
%{_sysconfdir}/vtysh.conf
%config(noreplace) %verify(not md5 mtime size) %attr(660,root,quagga)
%{_sysconfdir}/zebra.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/zebra
%dir %attr(770,root,quagga) /var/run/%{name}
%dir %attr(750,quagga,quagga) /var/log/%{name}
%dir %attr(750,root,root) /var/log/archive/%{name}
@@ -403,7 +411,6 @@
%attr(755,root,root) %{_sbindir}/zebra
%attr(754,root,root) /etc/rc.d/init.d/zebra
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root)
/etc/sysconfig/zebra
-%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root)
/etc/logrotate.d/zebra
%ghost /var/log/%{name}/zebra*
%files bgpd
@@ -417,6 +424,17 @@
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root)
/etc/logrotate.d/bgpd
%ghost /var/log/%{name}/bgpd*
+%files isisd
+%defattr(644,root,root,755)
+%doc isisd/*sample*
+%{_mandir}/man8/isisd*
+%attr(755,root,root) %{_sbindir}/isisd
+%attr(754,root,root) /etc/rc.d/init.d/isisd
+%config(noreplace) %verify(not md5 mtime size) %attr(660,root,quagga)
%{_sysconfdir}/isisd.conf
+%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root)
/etc/sysconfig/isisd
+%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root)
/etc/logrotate.d/isisd
+%ghost /var/log/%{name}/isisd*
+
%files ospfd
%defattr(644,root,root,755)
%doc ospfd/*sample*
@@ -462,17 +480,6 @@
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root)
/etc/logrotate.d/ripngd
%ghost /var/log/%{name}/ripngd*
-%files isisd
-%defattr(644,root,root,755)
-%doc isisd/*sample*
-%{_mandir}/man8/isisd*
-%attr(755,root,root) %{_sbindir}/isisd
-%attr(754,root,root) /etc/rc.d/init.d/isisd
-%config(noreplace) %verify(not md5 mtime size) %attr(660,root,quagga)
%{_sysconfdir}/isisd.conf
-%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root)
/etc/sysconfig/isisd
-%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root)
/etc/logrotate.d/isisd
-%ghost /var/log/%{name}/isisd*
-
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/lib*.so
@@ -489,6 +496,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.53 2009/04/10 00:33:26 gotar
+- added view_commands and save_history patches,
+- added env.d/VTYSH_PAGER,
+- sorted files and subpackages (moved isisd to right place)
+
Revision 1.52 2009/02/23 22:08:01 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/quagga.spec?r1=1.52&r2=1.53&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
