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

- Refresh pppoe.spec via spec-cleaner.

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

rp-pppoe.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov  9 12:53:45 UTC 2017 - ilya@ilya.pp.ua
+
+- Refresh pppoe.spec via spec-cleaner.
+
 -------------------------------------------------------------------
 Sun Oct  8 12:26:27 UTC 2017 - ilya@ilya.pp.ua
 

rp-pppoe.spec

@@ -17,11 +17,12 @@
 
 %define _name pppoe
 Name:           rp-%{_name}
+Version:        3.12
+Release:        0
 Summary:        A PPP Over Ethernet Redirector for PPPD
 License:        GPL-2.0+
 Group:          Productivity/Networking/PPP
-Version:        3.12
+URL:            https://www.roaringpenguin.com/products/pppoe
-Release:        0
 Source0:        https://www.roaringpenguin.com/files/download/%{name}-%{version}.tar.gz
 Source1:        %{_name}-connect
 Source2:        %{_name}-setup
@@ -30,7 +31,6 @@ Source4:        %{_name}-status
 Source5:        %{_name}-stop
 Source6:        %{_name}.service
 Source7:        %{_name}-server.service
-Url:            https://www.roaringpenguin.com/products/pppoe
 Patch0:         docdir.diff
 Patch1:         nonrfc-modems.diff
 Patch2:         release-buildsystem.diff
@@ -39,8 +39,10 @@ Patch4:         %{name}-3.10-config.patch
 Patch5:         %{name}-3.10-init.patch
 Patch6:         %{name}-pie.patch
 Patch7:         strip.diff
-Requires:       ppp net-tools
+BuildRequires:  ppp
-BuildRequires:  ppp systemd
+BuildRequires:  systemd
+Requires:       net-tools
+Requires:       ppp
 
 %description
 %{name} is a user-space redirector which permits the use of PPPoE
@@ -79,12 +81,12 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{_name}
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{_name}-server
 ln -sf %{_name}-stop %{buildroot}%{_sbindir}/adsl-stop
 ln -sf %{_name}-start %{buildroot}%{_sbindir}/adsl-start
-rm -rf %{buildroot}/etc/ppp/%{_name}.conf \
+rm -rf %{buildroot}%{_sysconfdir}/ppp/%{_name}.conf \
-       %{buildroot}/etc/rc.d/init.d/%{_name} \
+       %{buildroot}%{_sysconfdir}/rc.d/init.d/%{_name} \
-       %{buildroot}/etc/init.d
+       %{buildroot}%{_initddir}
 %make_install -C gui
-install -d  %{buildroot}%_defaultdocdir/%{name}
+install -d  %{buildroot}%{_defaultdocdir}/%{name}
-mv %{buildroot}/etc/ppp/plugins/README %{buildroot}%_defaultdocdir/%{name}/README.plugins
+mv %{buildroot}%{_sysconfdir}/ppp/plugins/README %{buildroot}%{_defaultdocdir}/%{name}/README.plugins
 rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
 
 %pre
@@ -104,12 +106,11 @@ rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
 %service_del_postun %{_name}-server.service
 
 %files
-%defattr(-,root,root)
+%dir %{_defaultdocdir}/%{name}
-%dir %_defaultdocdir/%{name}
+%doc %{_defaultdocdir}/%{name}/*
-%doc %_defaultdocdir/%{name}/*
+%config(noreplace) %{_sysconfdir}/ppp/%{_name}-server-options
-%config(noreplace) /etc/ppp/%{_name}-server-options
+%config(noreplace) %{_sysconfdir}/ppp/firewall-masq
-%config(noreplace) /etc/ppp/firewall-masq
+%config(noreplace) %{_sysconfdir}/ppp/firewall-standalone
-%config(noreplace) /etc/ppp/firewall-standalone
 %{_bindir}/tkpppoe
 %{_sbindir}/%{_name}
 %{_sbindir}/%{_name}-server
@@ -137,7 +138,7 @@ rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
 %{_sbindir}/rc%{_name}-server
 %{_unitdir}/%{_name}.service
 %{_unitdir}/%{_name}-server.service
-%dir /etc/ppp/%{name}-gui
+%dir %{_sysconfdir}/ppp/%{name}-gui
 %{_mandir}/man1/tk%{_name}.1*
 %{_mandir}/man1/%{_name}-wrapper.1*
 %dir %{_datarootdir}/tk%{_name}