Hello community,
here is the log from the commit of package rp-pppoe for openSUSE:Factory
checked in at Tue Jun 9 17:48:44 CEST 2009.
--------
--- rp-pppoe/rp-pppoe.changes 2008-07-04 11:43:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/rp-pppoe/rp-pppoe.changes 2009-05-08 02:18:45.000000000 +0200
@@ -1,0 +2,13 @@
+Fri May 8 02:15:32 CEST 2009 - chris@computersalat.de
+
+- new patch for init script
+ o added reload
+ o rework of status
+- added config patch
+
+-------------------------------------------------------------------
+Wed Apr 15 11:30:25 UTC 2009 - chris@computersalat.de
+
+- beautify spec
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
init-suse.diff
New:
----
rp-pppoe-3.10-config.patch
rp-pppoe-3.10-init.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rp-pppoe.spec ++++++
--- /var/tmp/diff_new_pack.m18282/_old 2009-06-09 17:46:56.000000000 +0200
+++ /var/tmp/diff_new_pack.m18282/_new 2009-06-09 17:46:56.000000000 +0200
@@ -1,35 +1,48 @@
#
# spec file for package rp-pppoe (Version 3.10)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+%if %{?rel:0}%{!?rel:1}
+%define rel 1
+%endif
Name: rp-pppoe
-BuildRequires: ppp
Summary: A PPP Over Ethernet Redirector for PPPD
Version: 3.10
-Release: 1
+Release: 27
License: GPL v2 or later
Group: Productivity/Networking/PPP
Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-%{version}.tar.bz2
Url: http://www.roaringpenguin.com/pppoe
-Patch0: init-suse.diff
+#Patch0: init-suse.diff
Patch1: docdir.diff
Patch2: nonrfc-modems.diff
Patch3: logger-path.diff
Patch5: release-buildsystem.diff
Patch6: resolve-conf.diff
Patch8: strip.diff
+Patch10: %{name}-3.10-init.patch
+Patch11: %{name}-3.10-config.patch
Requires: ppp >= 2.3.7
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq
+BuildRequires: ppp
+#----------------------------------------------------------------------------------
%description
rp-pppoe is a user-space redirector which permits the use of PPPoE
@@ -43,47 +56,64 @@
David F. Skoll http://www.roaringpenguin.com
%prep
+#----------------------------------------------------------------------------------
%setup -q
-%patch0
+#%patch0
%patch1
%patch2
%patch3
%patch5
%patch6
%patch8
+%patch10 -p1
+%patch11 -p1
+#----------------------------------------------------------------------------------
%build
+#----------------------------------------------------------------------------------
cd src
CFLAGS=$RPM_OPT_FLAGS \
%configure
-make
+%{__make}
cd ../gui
-make
+%{__make}
+#----------------------------------------------------------------------------------
%install
+#----------------------------------------------------------------------------------
cd src
-make install DESTDIR=$RPM_BUILD_ROOT
-ln -sf ../../etc/init.d/pppoe $RPM_BUILD_ROOT/usr/sbin/rcpppoe
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__ln_s} -f ../../etc/init.d/pppoe $RPM_BUILD_ROOT%{_sbindir}/rcpppoe
cd ../gui
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%_defaultdocdir/rp-pppoe
-mv $RPM_BUILD_ROOT/etc/ppp/plugins/README $RPM_BUILD_ROOT%_defaultdocdir/rp-pppoe/README.plugins
-rm -rf $RPM_BUILD_ROOT/etc/ppp/plugins
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__install} -d $RPM_BUILD_ROOT%_defaultdocdir/rp-pppoe
+%{__mv} $RPM_BUILD_ROOT/etc/ppp/plugins/README $RPM_BUILD_ROOT%_defaultdocdir/rp-pppoe/README.plugins
+%{__rm} -rf $RPM_BUILD_ROOT/etc/ppp/plugins
+#----------------------------------------------------------------------------------
%clean
-rm -rf $RPM_BUILD_ROOT
+#----------------------------------------------------------------------------------
+[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf $RPM_BUILD_ROOT
+#----------------------------------------------------------------------------------
%preun
+#----------------------------------------------------------------------------------
%stop_on_removal pppoe
+#----------------------------------------------------------------------------------
%post
+#----------------------------------------------------------------------------------
%{fillup_and_insserv pppoe}
+#----------------------------------------------------------------------------------
%postun
+#----------------------------------------------------------------------------------
%restart_on_update pppoe
%{insserv_cleanup}
+#----------------------------------------------------------------------------------
%files
+#----------------------------------------------------------------------------------
%defattr(-,root,root)
%dir %_defaultdocdir/rp-pppoe
%doc %_defaultdocdir/rp-pppoe/*
@@ -91,15 +121,18 @@
%config(noreplace) /etc/ppp/pppoe-server-options
%config(noreplace) /etc/ppp/firewall-masq
%config(noreplace) /etc/ppp/firewall-standalone
-/usr/sbin/pppoe
-/usr/sbin/pppoe-server
-/usr/sbin/pppoe-sniff
-/usr/sbin/pppoe-relay
-/usr/sbin/pppoe-connect
-/usr/sbin/pppoe-start
-/usr/sbin/pppoe-stop
-/usr/sbin/pppoe-setup
-/usr/sbin/pppoe-status
+%{_bindir}/tkpppoe
+%{_sbindir}/pppoe
+%{_sbindir}/pppoe-server
+%{_sbindir}/pppoe-sniff
+%{_sbindir}/pppoe-relay
+%{_sbindir}/pppoe-connect
+%{_sbindir}/pppoe-start
+%{_sbindir}/pppoe-stop
+%{_sbindir}/pppoe-setup
+%{_sbindir}/pppoe-status
+%attr (4750,root,dialout) %{_sbindir}/pppoe-wrapper
+%{_sbindir}/rcpppoe
%{_mandir}/man5/pppoe.conf.5*
%{_mandir}/man8/pppoe.8*
%{_mandir}/man8/pppoe-server.8*
@@ -111,10 +144,7 @@
%{_mandir}/man8/pppoe-status.8*
%{_mandir}/man8/pppoe-setup.8*
/etc/init.d/pppoe
-/usr/sbin/rcpppoe
%dir /etc/ppp/rp-pppoe-gui
-%attr (4750,root,dialout) /usr/sbin/pppoe-wrapper
-/usr/bin/tkpppoe
%{_mandir}/man1/tkpppoe.1*
%{_mandir}/man1/pppoe-wrapper.1*
%dir /usr/share/tkpppoe
@@ -128,8 +158,17 @@
/usr/share/tkpppoe/props-options.png
/usr/share/tkpppoe/en.msg
/usr/share/tkpppoe/ja.msg
+#----------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------
%changelog
+* Fri May 08 2009 chris@computersalat.de
+- new patch for init script
+ o added reload
+ o rework of status
+- added config patch
+* Wed Apr 15 2009 chris@computersalat.de
+- beautify spec
* Fri Jul 04 2008 hvogel@suse.de
- update to version 3.10
* some compilation fixes
++++++ rp-pppoe-3.10-config.patch ++++++
diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppoe-connect.in
--- rp-pppoe-3.10-orig/scripts/pppoe-connect.in 2008-06-30 14:00:42.000000000 +0000
+++ rp-pppoe-3.10/scripts/pppoe-connect.in 2009-05-08 00:03:58.229112396 +0000
@@ -48,7 +48,7 @@
SETSID=""
fi
-CONFIG=/etc//ppp/pppoe.conf
+CONFIG=/etc/ppp/pppoe.conf
USER=""
ETH=""
++++++ rp-pppoe-3.10-init.patch ++++++
diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-init-suse.in rp-pppoe-3.10/scripts/pppoe-init-suse.in
--- rp-pppoe-3.10-orig/scripts/pppoe-init-suse.in 2008-06-30 14:00:42.000000000 +0000
+++ rp-pppoe-3.10/scripts/pppoe-init-suse.in 2009-05-08 00:07:50.511480596 +0000
@@ -12,53 +12,114 @@
# 2 or any later version.
# Modifed to work with SuSE 6.4 linux by Gary Cameron.
#
-# Source function library.
-#. /etc/rc.d/init.d/functions # For red hat?
-. /etc/rc.config # For SuSE, enables setting from /etc/rc.config
+# Modifed and fixed to work with SuSE linux by Anas Nashif