rpms/quagga
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed using %ghost, corrected installation, removed unused part of script

Browse Source
This commit is contained in:
Jiri Skala 2010-12-02 10:49:33 +01:00
parent 2240220074
commit 55e8a7e718
1 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
quagga.spec
View File

@ -32,7 +32,7 @@
Summary: Routing daemon
Name: quagga
Version: 0.99.17
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Daemons
Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz
@ -176,7 +176,7 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d} \
$RPM_BUILD_ROOT/var/log/quagga $RPM_BUILD_ROOT%{_infodir}
%if %with_pam
install -d $RPM_BUILD_ROOT/etc/$RPM_BUILD_ROOT/etc/pam.d
install -d $RPM_BUILD_ROOT/etc/pam.d
%endif
make install \
@ -223,34 +223,6 @@ if getent passwd %quagga_user >/dev/null 2>&1 ; then : ; else \
%endif
%post
# /etc/services is already populated, so skip this
# zebra_spec_add_service <service name> <port/proto> <comment>
# e.g. zebra_spec_add_service zebrasrv 2600/tcp "zebra service"
#
#zebra_spec_add_service ()
#{
# # Add port /etc/services entry if it isn't already there
# if [ -f /etc/services ] && ! grep -q "^$1[^a-zA-Z0-9]" /etc/services ; then
# echo "$1 $2 # $3" >> /etc/services
# fi
#}
#
#zebra_spec_add_service zebrasrv 2600/tcp "zebra service"
#zebra_spec_add_service zebra 2601/tcp "zebra vty"
#zebra_spec_add_service ripd 2602/tcp "RIPd vty"
#%if %with_ipv6
#zebra_spec_add_service ripngd 2603/tcp "RIPngd vty"
#%endif
#zebra_spec_add_service ospfd 2604/tcp "OSPFd vty"
#zebra_spec_add_service bgpd 2605/tcp "BGPd vty"
#%if %with_ipv6
#zebra_spec_add_service ospf6d 2606/tcp "OSPF6d vty"
#%endif
#%if %with_ospfapi
#zebra_spec_add_service ospfapi 2607/tcp "OSPF-API"
#%endif
/sbin/chkconfig --add zebra
/sbin/chkconfig --add ripd
%if %with_ipv6
@ -324,13 +296,13 @@ rm -rf $RPM_BUILD_ROOT
%doc ChangeLog INSTALL NEWS README REPORTING-BUGS SERVICES TODO
%if %quagga_user
%dir %attr(751,%quagga_user,%quagga_user) %{_sysconfdir}
%dir %attr(770,%quagga_user,%quagga_user) /var/log/quagga
%dir %attr(771,%quagga_user,%quagga_user) /var/run/quagga
%dir %attr(770,%quagga_user,%quagga_user) %ghost /var/log/quagga
%dir %attr(771,%quagga_user,%quagga_user) %ghost /var/run/quagga
%else
%dir %attr(750,root,root) %{_sysconfdir}
%dir %attr(750,root,root) /var/log/quagga
%dir %attr(750,root,root) %ghost /var/log/quagga
%dir %attr(755,root,root) /usr/share/info
%dir %attr(750,root,root) /var/run/quagga
%dir %attr(750,root,root) %ghost /var/run/quagga
%endif
%if %vty_group
# noreplace not used due to smaple conf file
@ -373,6 +345,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Thu Dec 02 2010 Jiri Skala <jskala@redhat.com> - 0.99.17-3
- fixes #656681 - using %ghost on files in /var/run and /var/lock
- removed unused script from spec
- corrected installing /etc/pam.d
* Mon Nov 01 2010 Jiri Skala <jskala@redhat.com> - 0.99.17-2
- rebuild for net-snmp