From 6ba2100cd485ada1de35c9e87d7cc0c73175cffd755c6d13c353bd6f79fafd1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?=
 =?UTF-8?q?=D0=BE?= <ilya@ilya.cf>
Date: Sat, 10 Mar 2018 01:51:24 +0000
Subject: [PATCH] Accepting request 585193 from home:13ilya:branches:network

- Refresh spec-file via spec-cleaner and manual optimisations.
- Add %license macro.

OBS-URL: https://build.opensuse.org/request/show/585193
OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=22
---
 rp-pppoe.changes |  6 ++++++
 rp-pppoe.spec    | 54 ++++++++++++------------------------------------
 2 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/rp-pppoe.changes b/rp-pppoe.changes
index c6755db..09495ed 100644
--- a/rp-pppoe.changes
+++ b/rp-pppoe.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Mar 10 01:45:49 UTC 2018 - ilya@ilya.pp.ua
+
+- Refresh spec-file via spec-cleaner and manual optimisations.
+- Add %license macro.
+
 -------------------------------------------------------------------
 Thu Nov 23 14:06:28 UTC 2017 - ilya@ilya.pp.ua
 
diff --git a/rp-pppoe.spec b/rp-pppoe.spec
index 0a4445a..ca45ca3 100644
--- a/rp-pppoe.spec
+++ b/rp-pppoe.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rp-pppoe
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@ Name:           rp-%{_name}
 Version:        3.12
 Release:        0
 Summary:        A PPP Over Ethernet Redirector for PPPD
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/PPP
 URL:            https://www.roaringpenguin.com/products/pppoe
 Source0:        https://www.roaringpenguin.com/files/download/%{name}-%{version}.tar.gz
@@ -95,7 +95,7 @@ rm -rf %{buildroot}%{_sysconfdir}/ppp/%{_name}.conf \
 %make_install -C gui
 install -d  %{buildroot}%{_defaultdocdir}/%{name}
 mv %{buildroot}%{_sysconfdir}/ppp/plugins/README %{buildroot}%{_defaultdocdir}/%{name}/README.plugins
-rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
+rm -r %{buildroot}%{_sysconfdir}/ppp/plugins %{buildroot}%{_defaultdocdir}/%{name}/LICENSE
 
 %pre
 %if 0%{?suse_version} < 1330
@@ -121,52 +121,24 @@ getent group %{_group} >/dev/null || %{_sbindir}/groupadd -r %{_group}
 %verify_permissions -e %{_sbindir}/%{_name}-wrapper
 
 %files
+%defattr(0644,root,root,-)
+%license doc/LICENSE
 %dir %{_defaultdocdir}/%{name}
 %doc %{_defaultdocdir}/%{name}/*
-%config(noreplace) %{_sysconfdir}/ppp/%{_name}-server-options
-%config(noreplace) %{_sysconfdir}/ppp/firewall-masq
-%config(noreplace) %{_sysconfdir}/ppp/firewall-standalone
-%{_bindir}/tkpppoe
-%{_sbindir}/%{_name}
-%{_sbindir}/%{_name}-server
-%{_sbindir}/%{_name}-sniff
-%{_sbindir}/%{_name}-relay
-%{_sbindir}/%{_name}-connect
-%{_sbindir}/%{_name}-start
-%{_sbindir}/%{_name}-stop
-%{_sbindir}/%{_name}-setup
-%{_sbindir}/%{_name}-status
-%attr (4750,root,dialout) %{_sbindir}/%{_name}-wrapper
-%{_mandir}/man5/%{_name}.conf.5*
-%{_mandir}/man8/%{_name}.8*
-%{_mandir}/man8/%{_name}-server.8*
-%{_mandir}/man8/%{_name}-relay.8*
-%{_mandir}/man8/%{_name}-sniff.8*
-%{_mandir}/man8/%{_name}-connect.8*
-%{_mandir}/man8/%{_name}-start.8*
-%{_mandir}/man8/%{_name}-stop.8*
-%{_mandir}/man8/%{_name}-status.8*
-%{_mandir}/man8/%{_name}-setup.8*
-%{_sbindir}/adsl-start
-%{_sbindir}/adsl-stop
+%config(noreplace) %{_sysconfdir}/ppp/*
+%attr(0755,root,root) %{_bindir}/tkpppoe
+%attr(0755,root,root) %{_sbindir}/%{_name}
+%attr(0755,root,root) %{_sbindir}/%{_name}-{c,r,s}*
+%attr(4750,root,dialout) %{_sbindir}/%{_name}-wrapper
+%{_mandir}/man?/*%{?ext_man}
+%{_sbindir}/adsl-st*
 %{_sbindir}/rc%{_name}
 %{_sbindir}/rc%{_name}-server
 %{_unitdir}/%{_name}.service
 %{_unitdir}/%{_name}-server.service
 %dir %{_sysconfdir}/ppp/%{name}-gui
-%{_mandir}/man1/tk%{_name}.1*
-%{_mandir}/man1/%{_name}-wrapper.1*
 %dir %{_datarootdir}/tk%{_name}
-%{_datarootdir}/tk%{_name}/tk%{_name}.html
-%{_datarootdir}/tk%{_name}/mainwin-busy.png
-%{_datarootdir}/tk%{_name}/mainwin-nonroot.png
-%{_datarootdir}/tk%{_name}/mainwin.png
-%{_datarootdir}/tk%{_name}/props-advanced.png
-%{_datarootdir}/tk%{_name}/props-basic.png
-%{_datarootdir}/tk%{_name}/props-nic.png
-%{_datarootdir}/tk%{_name}/props-options.png
-%{_datarootdir}/tk%{_name}/en.msg
-%{_datarootdir}/tk%{_name}/ja.msg
+%{_datarootdir}/tk%{_name}/?*.{html,msg,png}
 %verify(not mode caps) %attr(4750,root,dialout) %{_sbindir}/%{_name}-wrapper
 
 %changelog