Attachment 1007 Details for Bug 7404 – rp-pppoe.spec.patch

[patch] rp-pppoe.spec.patch

rp-pppoe.spec.diff (text/plain), 3.39 KB, created by Sir Raorn on 2005-07-20 11:12:49 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Sir Raorn

Created: 2005-07-20 11:12:49 MSD

Size: 3.39 KB

patch

obsolete

>--- rp-pppoe.spec.orig	2005-05-29 02:46:33 +0400
>+++ rp-pppoe.spec	2005-07-20 10:57:13 +0400
>@@ -37,11 +37,23 @@
> PPPoE (Point-to-Point Protocol ÷åðåç Ethernet) ýòî ïðîòîêîë, èñïîëüçóåìûé
> ìíîãèìè Ïîñòàâùèêàìè Óñëóã Èíòåðíåò ïî ADSL.
> 
>+%package base
>+Summary: PPP Over Ethernet (xDSL support)
>+Group: Networking/Remote access
>+
>+%description base
>+PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used by
>+many ADSL Internet Service Providers. Roaring Penguin has a free
>+client for Linux systems to connect to PPPoE service providers.
>+
>+This package contains basic utilites.
>+
> %package client
> Summary: PPP Over Ethernet (xDSL support)
> Summary(ru_RU.CP1251): PPP ÷åðåç Ethernet (ïîääåðæêà xDSL)
> Group: Networking/Remote access
> Requires: ppp >= 2.3.7
>+Requires: %name-base = %version-%release
> Provides: rp-pppoe
> Obsoletes: rp-pppoe
> 
>@@ -65,6 +77,8 @@
> Summary(ru_RU.CP1251): PPP ÷åðåç Ethernet (ïîääåðæêà xDSL)
> Group: Networking/Remote access
> Requires: ppp >= 2.3.7
>+Conflicts: %name-base < %version-%release
>+Conflicts: %name-base > %version-%release
> 
> %description server
> pppoe-server is a user-space server for PPPoE (Point-to-Point Protocol over Ethernet)
>@@ -77,7 +91,7 @@
> Summary: Tk interface for PPP Over Ethernet Client (xDSL support)
> Summary(ru_RU.CP1251): Tk èíòåðôåéñ ê Êëèåíòó PPP ÷åðåç Ethernet (ïîääåðæêà xDSL)
> Group: Networking/Remote access
>-Requires: %name-client >= 3.5 tk
>+Requires: %name-client = %version-%release tk
> 
> %description gui
> This is a graphical wrapper around the rp-pppoe PPPoE client. PPPoE is
>@@ -125,40 +139,45 @@
> #alias net-pf-24 pppoe
> #EOF
> 
>+%post client
>+%post_service adsl
>+[ -h /etc/ppp/resolv.conf ] && %__rm -f /etc/ppp/resolv.conf && cat /etc/resolv.conf > /etc/ppp/resolv.conf ||:
>+
>+%preun client
>+%preun_service adsl
>+
>+%pre gui
>+%pre_control pppoe-wrapper
>+
>+%post gui
>+%post_control pppoe-wrapper
>+%update_menus
>+
>+%postun gui
>+%clean_menus
>+
>+%files base
>+%_sbindir/pppoe
>+%_sbindir/pppoe-sniff
>+%_sbindir/pppoe-relay
>+%_man8dir/pppoe.8*
>+%_man8dir/pppoe-relay.8*
>+%_man8dir/pppoe-sniff.8*
>+
> %files client
> %attr(750,root,root) %_sysconfdir/ppp/adsl-lost
> %config(noreplace) %_sysconfdir/ppp/pppoe.conf
> %config(noreplace) %_sysconfdir/ppp/firewall*
> %config(noreplace) %_initdir/adsl
>-%_sbindir/pppoe
>-%_sbindir/pppoe-sniff
>-%_sbindir/pppoe-relay
> %_sbindir/adsl*
> %_man5dir/*
> %_man8dir/adsl-*
>-%_man8dir/pppoe.*
>-%_man8dir/pppoe-relay*
>-%_man8dir/pppoe-sniff*
> %doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE README USB-ADSL-MINI-HOWTO.sgml
> 
>-%post client
>-#/sbin/chkconfig --add adsl
>-
>-#if [ -f /etc/ppp/resolv.conf ]; then 
>-#    rm -f /etc/ppp/resolv.conf && ln -s /etc/resolv.conf /etc/ppp/resolv.conf
>-#else
>-#    ln -s /etc/resolv.conf /etc/ppp/resolv.conf
>-#fi
>-
>-[ -h /etc/ppp/resolv.conf ] && rm -f /etc/ppp/resolv.conf && cat /etc/resolv.conf > /etc/ppp/resolv.conf ||:
>-
>-%preun client
>-/sbin/chkconfig --del adsl
>-
> %files server
> %config(noreplace) %_sysconfdir/ppp/pppoe-server-options
> %_sbindir/pppoe-server
>-%_man8dir/pppoe-server*
>+%_man8dir/pppoe-server.8*
> %doc doc/LICENSE SERVPOET PPPoE-SERVER-MINI-HOWTO.sgml
> 
> %files gui
>@@ -172,16 +191,6 @@
> %_datadir/tkpppoe/*
> %_man1dir/*
> 
>-%pre gui
>-[ $1 -eq 1 ] || /usr/sbin/control-dump pppoe-wrapper
>-
>-%post gui
>-[ $1 -eq 1 ] || /usr/sbin/control-restore pppoe-wrapper
>-%update_menus
>-
>-%postun gui
>-%clean_menus
>-
> %changelog
> * Sun May 29 2005 Aleksandr Blokhin 'Sass' <sass@altlinux.ru> 3.5-alt16
> - Updated patch3

Actions: View | Diff

Attachments on bug 7404: 1007