Attachment #1007 for bug #7404

View | Details | Raw Unified | Return to bug 7404
Collapse All | Expand All




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


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)

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 = %version-%release tk

%description gui
This is a graphical wrapper around the rp-pppoe PPPoE client. PPPoE is

#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.8*
%doc doc/LICENSE SERVPOET PPPoE-SERVER-MINI-HOWTO.sgml

%files gui

%_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

Return to bug 7404

Lines 37-47 Link Here

(-)rp-pppoe.spec.orig (-32 / +41 lines)
37	PPPoE (Point-to-Point Protocol ÷åðåç Ethernet) ýòî ïðîòîêîë, èñïîëüçóåìûé	37	PPPoE (Point-to-Point Protocol ÷åðåç Ethernet) ýòî ïðîòîêîë, èñïîëüçóåìûé
38	ìíîãèìè Ïîñòàâùèêàìè Óñëóã Èíòåðíåò ïî ADSL.	38	ìíîãèìè Ïîñòàâùèêàìè Óñëóã Èíòåðíåò ïî ADSL.
39		39
		40	%package base
		41	Summary: PPP Over Ethernet (xDSL support)
		42	Group: Networking/Remote access
		43
		44	%description base
		45	PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used by
		46	many ADSL Internet Service Providers. Roaring Penguin has a free
		47	client for Linux systems to connect to PPPoE service providers.
		48
		49	This package contains basic utilites.
		50
40	%package client	51	%package client
41	Summary: PPP Over Ethernet (xDSL support)	52	Summary: PPP Over Ethernet (xDSL support)
42	Summary(ru_RU.CP1251): PPP ÷åðåç Ethernet (ïîääåðæêà xDSL)	53	Summary(ru_RU.CP1251): PPP ÷åðåç Ethernet (ïîääåðæêà xDSL)
43	Group: Networking/Remote access	54	Group: Networking/Remote access
44	Requires: ppp >= 2.3.7	55	Requires: ppp >= 2.3.7
		56	Requires: %name-base = %version-%release
45	Provides: rp-pppoe	57	Provides: rp-pppoe
46	Obsoletes: rp-pppoe	58	Obsoletes: rp-pppoe
47		59
Lines 65-70 Link Here
65	Summary(ru_RU.CP1251): PPP ÷åðåç Ethernet (ïîääåðæêà xDSL)	77	Summary(ru_RU.CP1251): PPP ÷åðåç Ethernet (ïîääåðæêà xDSL)
66	Group: Networking/Remote access	78	Group: Networking/Remote access
67	Requires: ppp >= 2.3.7	79	Requires: ppp >= 2.3.7
		80	Conflicts: %name-base < %version-%release
		81	Conflicts: %name-base > %version-%release
68		82
69	%description server	83	%description server
70	pppoe-server is a user-space server for PPPoE (Point-to-Point Protocol over Ethernet)	84	pppoe-server is a user-space server for PPPoE (Point-to-Point Protocol over Ethernet)
Lines 77-83 Link Here
77	Summary: Tk interface for PPP Over Ethernet Client (xDSL support)	91	Summary: Tk interface for PPP Over Ethernet Client (xDSL support)
78	Summary(ru_RU.CP1251): Tk èíòåðôåéñ ê Êëèåíòó PPP ÷åðåç Ethernet (ïîääåðæêà xDSL)	92	Summary(ru_RU.CP1251): Tk èíòåðôåéñ ê Êëèåíòó PPP ÷åðåç Ethernet (ïîääåðæêà xDSL)
79	Group: Networking/Remote access	93	Group: Networking/Remote access
80	Requires: %name-client >= 3.5 tk	94	Requires: %name-client = %version-%release tk
81		95
82	%description gui	96	%description gui
83	This is a graphical wrapper around the rp-pppoe PPPoE client. PPPoE is	97	This is a graphical wrapper around the rp-pppoe PPPoE client. PPPoE is
Lines 125-164 Link Here
125	#alias net-pf-24 pppoe	139	#alias net-pf-24 pppoe
126	#EOF	140	#EOF
127		141
		142	%post client
		143	%post_service adsl
		144	[ -h /etc/ppp/resolv.conf ] && %__rm -f /etc/ppp/resolv.conf && cat /etc/resolv.conf > /etc/ppp/resolv.conf \|\|:
		145
		146	%preun client
		147	%preun_service adsl
		148
		149	%pre gui
		150	%pre_control pppoe-wrapper
		151
		152	%post gui
		153	%post_control pppoe-wrapper
		154	%update_menus
		155
		156	%postun gui
		157	%clean_menus
		158
		159	%files base
		160	%_sbindir/pppoe
		161	%_sbindir/pppoe-sniff
		162	%_sbindir/pppoe-relay
		163	%_man8dir/pppoe.8*
		164	%_man8dir/pppoe-relay.8*
		165	%_man8dir/pppoe-sniff.8*
		166
128	%files client	167	%files client
129	%attr(750,root,root) %_sysconfdir/ppp/adsl-lost	168	%attr(750,root,root) %_sysconfdir/ppp/adsl-lost
130	%config(noreplace) %_sysconfdir/ppp/pppoe.conf	169	%config(noreplace) %_sysconfdir/ppp/pppoe.conf
131	%config(noreplace) %_sysconfdir/ppp/firewall*	170	%config(noreplace) %_sysconfdir/ppp/firewall*
132	%config(noreplace) %_initdir/adsl	171	%config(noreplace) %_initdir/adsl
133	%_sbindir/pppoe
134	%_sbindir/pppoe-sniff
135	%_sbindir/pppoe-relay
136	%_sbindir/adsl*	172	%_sbindir/adsl*
137	%_man5dir/*	173	%_man5dir/*
138	%_man8dir/adsl-*	174	%_man8dir/adsl-*
139	%_man8dir/pppoe.*
140	%_man8dir/pppoe-relay*
141	%_man8dir/pppoe-sniff*
142	%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE README USB-ADSL-MINI-HOWTO.sgml	175	%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE README USB-ADSL-MINI-HOWTO.sgml
143		176
144	%post client
145	#/sbin/chkconfig --add adsl
146
147	#if [ -f /etc/ppp/resolv.conf ]; then
148	# rm -f /etc/ppp/resolv.conf && ln -s /etc/resolv.conf /etc/ppp/resolv.conf
149	#else
150	# ln -s /etc/resolv.conf /etc/ppp/resolv.conf
151	#fi
152
153	[ -h /etc/ppp/resolv.conf ] && rm -f /etc/ppp/resolv.conf && cat /etc/resolv.conf > /etc/ppp/resolv.conf \|\|:
154
155	%preun client
156	/sbin/chkconfig --del adsl
157
158	%files server	177	%files server
159	%config(noreplace) %_sysconfdir/ppp/pppoe-server-options	178	%config(noreplace) %_sysconfdir/ppp/pppoe-server-options
160	%_sbindir/pppoe-server	179	%_sbindir/pppoe-server
161	%_man8dir/pppoe-server*	180	%_man8dir/pppoe-server.8*
162	%doc doc/LICENSE SERVPOET PPPoE-SERVER-MINI-HOWTO.sgml	181	%doc doc/LICENSE SERVPOET PPPoE-SERVER-MINI-HOWTO.sgml
163		182
164	%files gui	183	%files gui
Lines 172-187 Link Here
172	%_datadir/tkpppoe/*	191	%_datadir/tkpppoe/*
173	%_man1dir/*	192	%_man1dir/*
174		193
175	%pre gui
176	[ $1 -eq 1 ] \|\| /usr/sbin/control-dump pppoe-wrapper
177
178	%post gui
179	[ $1 -eq 1 ] \|\| /usr/sbin/control-restore pppoe-wrapper
180	%update_menus
181
182	%postun gui
183	%clean_menus
184
185	%changelog	194	%changelog
186	* Sun May 29 2005 Aleksandr Blokhin 'Sass' <sass@altlinux.ru> 3.5-alt16	195	* Sun May 29 2005 Aleksandr Blokhin 'Sass' <sass@altlinux.ru> 3.5-alt16
187	- Updated patch3	196	- Updated patch3