Accepting request 437350 from home:13ilya:branches:network

OBS-URL: https://build.opensuse.org/request/show/437350
OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=10

release-buildsystem.diff

@@ -2,7 +2,7 @@ Index: src/Makefile.in
 ===================================================================
 --- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -195,11 +195,9 @@ install: all
+@@ -214,11 +214,9 @@ install: all
  		mkdir -p $(DESTDIR)/etc/rc.d/init.d ;\
  		$(install) -m 755 ../scripts/pppoe-init-turbolinux $(DESTDIR)/etc/rc.d/init.d/pppoe ; \
  	fi

rp-pppoe-3.11.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5abf7dc6b22a81e31bd0120faa784c21fa43397a80d40b6cac1a39058e84d138
-size 191887

rp-pppoe-3.12.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2
+size 224125

rp-pppoe.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Oct 25 22:23:41 EEST 2016 - 13ilya@gmail.com
+
+- Update to version 3.12.
+- Fix patch release-buildsystem.diff for 3.12 version.
+- Add to Requires net-tools-deprecated package.
+- Reordered patch positions.
+- Formated all the variables in the spec-file to macro style.
+
 -------------------------------------------------------------------
 Sat Oct 25 09:51:24 UTC 2014 - p.drouand@gmail.com
 
@@ -268,4 +277,3 @@ Wed Mar 29 17:59:12 CEST 2000 - nashif@suse.de
 Wed Feb 23 01:43:27 CET 2000 - nashif@suse.de
 
 - Initial Release (Version 1.3)
-

rp-pppoe.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rp-pppoe
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -14,7 +14,6 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
 %if 0%{?suse_version} > 1140
 %define has_systemd 1
 %endif
@@ -23,27 +22,26 @@ Name:           rp-pppoe
 Summary:        A PPP Over Ethernet Redirector for PPPD
 License:        GPL-2.0+
 Group:          Productivity/Networking/PPP
-Version:        3.11
+Version:        3.12
 Release:        0
-Source:         http://www.roaringpenguin.com/pppoe/rp-pppoe-%{version}.tar.bz2
+Source0:        https://www.roaringpenguin.com/files/download/rp-pppoe-%{version}.tar.gz
 Source1:        pppoe-connect
 Source2:        pppoe-setup
 Source3:        pppoe-start
 Source4:        pppoe-status
 Source5:        pppoe-stop
 Source6:        pppoe-server.service
-Url:            http://www.roaringpenguin.com/pppoe
+Url:            https://www.roaringpenguin.com/products/pppoe
-#Patch0:         init-suse.diff
+Patch0:         docdir.diff
-Patch1:         docdir.diff
+Patch1:         logger-path.diff
 Patch2:         nonrfc-modems.diff
-Patch3:         logger-path.diff
+Patch3:         release-buildsystem.diff
-Patch5:         release-buildsystem.diff
+Patch4:         resolve-conf.diff
-Patch6:         resolve-conf.diff
+Patch5:         %{name}-3.10-config.patch
+Patch6:         %{name}-3.10-init.patch
+Patch7:         rp-pppoe-pie.patch
 Patch8:         strip.diff
-Patch10:        %{name}-3.10-init.patch
+Requires:       ppp net-tools-deprecated
-Patch11:        %{name}-3.10-config.patch
-Patch12:        rp-pppoe-pie.patch
-Requires:       ppp >= 2.3.7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ppp
 %if 0%{?has_systemd}
@@ -59,26 +57,25 @@ many ADSL service providers.
 
 %prep
 %setup -q
-#%patch0
+%patch0
 %patch1
 %patch2
 %patch3
-%patch5
+%patch4
-%patch6
+%patch5 -p1
+%patch6 -p1
+%patch7
 %patch8
-%patch10 -p1
-%patch11 -p1
-%patch12
 
 %build
 cd src
 %configure
-make
+make %{?_smp_mflags}
 cd ../gui
-make
+make %{?_smp_mflags}
 
 %install
-make -C src install DESTDIR=$RPM_BUILD_ROOT
+%make_install -C src
 %if 0%{?has_systemd}
 mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_unitdir}
 install -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}
@@ -94,11 +91,11 @@ rm -rf %{buildroot}/etc/ppp/pppoe.conf \
        %{buildroot}/etc/init.d
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpppoe-server
 %else
-%{__ln_s} -f ../../etc/init.d/pppoe $RPM_BUILD_ROOT%{_sbindir}/rcpppoe
+%{__ln_s} -f ../../etc/init.d/pppoe %{buildroot}%{_sbindir}/rcpppoe
 %endif
-make -C gui install DESTDIR=$RPM_BUILD_ROOT
+%make_install -C gui
-install -d  $RPM_BUILD_ROOT%_defaultdocdir/rp-pppoe
+install -d  %{buildroot}%_defaultdocdir/rp-pppoe
-mv $RPM_BUILD_ROOT/etc/ppp/plugins/README $RPM_BUILD_ROOT%_defaultdocdir/rp-pppoe/README.plugins
+mv %{buildroot}/etc/ppp/plugins/README %{buildroot}%_defaultdocdir/rp-pppoe/README.plugins
 %{__rm} -rf %{buildroot}%{_sysconfdir}/ppp/plugins
 
 %if 0%{?has_systemd}