rpms/rp-pppoe/devel rp-pppoe.spec,1.50,1.51

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28542

Modified Files:
	rp-pppoe.spec 
Log Message:
- wrong path to initscript bz#522010
- add remove services in %postun/%preun




Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- rp-pppoe.spec	7 Sep 2009 16:26:58 -0000	1.50
+++ rp-pppoe.spec	9 Sep 2009 11:01:02 -0000	1.51
@@ -64,7 +64,7 @@ install -m 0755 %{SOURCE2} %{buildroot}/
 install -m 0755 %{SOURCE3} %{buildroot}/sbin
 install -m 0755 %{SOURCE4} %{buildroot}/sbin
 install -m 0755 %{SOURCE5} %{buildroot}/sbin
-install -m 0755 %{SOURCE6} %{buildroot}%{_sysconfdir}/etc/rc.d/init.d/pppoe-server
+install -m 0755 %{SOURCE6} %{buildroot}%{_sysconfdir}/rc.d/init.d/pppoe-server
 
 pushd %{buildroot}%{_sbindir}
 ln -s ../../sbin/* .
@@ -80,6 +80,20 @@ rm -rf %{buildroot}/etc/ppp/pppoe.conf \
 %clean
 rm -rf %{buildroot}
 
+%preun
+if [ "$1" = "0" ]; then
+   /sbin/service pppoe-server stop > /dev/null 2>&1
+   /sbin/chkconfig --del pppoe-server
+fi
+exit 0
+
+%postun
+if [ "$1" -ge "1" ]; then
+   /sbin/service pppoe-server condrestart > /dev/null 2>&1
+fi
+exit 0
+
+
 %triggerpostun -- rp-pppoe < 3.2-1
 if [ -f /etc/rc.d/init.d/pppoe ]; then
    rm -f /etc/rc.d/init.d/pppoe
@@ -144,12 +158,16 @@ exit 0
 %doc configs
 %config(noreplace) %{_sysconfdir}/ppp/pppoe-server-options
 %config(noreplace) %{_sysconfdir}/ppp/firewall*
-%config(noreplace) %{_sysconfdir}/etc/rc.d/init.d/*
+%config(noreplace) %{_sysconfdir}/rc.d/init.d/*
 /sbin/*
 %{_sbindir}/*
 %{_mandir}/man?/*
 
 %changelog
+* Wed Sep 09 2009 Than Ngo <than at redhat.com> - 3.10-5
+- wrong path to initscript bz#522010
+- add remove services in %postun/%preun
+
 * Mon Sep 07 2009 Than Ngo <than at redhat.com> - 3.10-4
 - add feature, save and restore all information about default routes bz#191242
 - add startup script for pppoe-server bz#507123