From dd33c4036c745ba8fc7fe6c3f49c7708f1598d739656e4ba0f630d2e24a9f5cc Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sat, 16 Jan 2021 15:16:49 +0000
Subject: [PATCH] Accepting request 847054 from home:13ilya:branches:network

- Refresh spec-file via spec-cleaner and manual optimizations.
  * Removed obsolete constructs (creating dialout group via shadow).

OBS-URL: https://build.opensuse.org/request/show/847054
OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=65
---
 ppp.changes |  7 ++++++-
 ppp.spec    | 17 ++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ppp.changes b/ppp.changes
index 96aed2b..b743d7d 100644
--- a/ppp.changes
+++ b/ppp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov  9 07:21:55 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
+
+- Refresh spec-file via spec-cleaner and manual optimizations.
+  * Removed obsolete constructs (creating dialout group via shadow).
+
 -------------------------------------------------------------------
 Fri Oct  9 11:15:53 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
@@ -971,4 +977,3 @@ Sat Nov  2 17:35:11 CET 1996 - florian@suse.de
 
 - add bug-fix
 - add ipx support
-
diff --git a/ppp.spec b/ppp.spec
index 044391c..2796a4c 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -77,12 +77,8 @@ BuildRequires:  libpcap-devel
 BuildRequires:  linux-atm-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
-%if 0%{?suse_version} >= 1330
 Requires:       group(%{_group})
 Requires(pre):  group(%{_group})
-%else
-Requires(pre):  shadow
-%endif
 
 %description
 The ppp package contains the PPP (Point-to-Point Protocol) daemon,
@@ -104,9 +100,9 @@ plugins for the pppd.
 %package modem
 Summary:        Automatic redial for any USB modem supported by the kernel
 Group:          System/Kernel
+Requires:       group(dialout)
 Requires:       ppp
 Requires:       udev
-Requires:       group(dialout)
 BuildArch:      noarch
 
 %description modem
@@ -151,7 +147,7 @@ sed -i '/#HAVE_LIBATM/s/#//' pppd/plugins/pppoatm/Makefile.linux
 %build
 export MY_CFLAGS="%{optflags} -fno-strict-aliasing -fPIC $SP"
 %configure
-make %{?_smp_mflags} CHAPMS=y CBCP=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y HAVE_LOGWTMP=y
+%make_build CHAPMS=y CBCP=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y HAVE_LOGWTMP=y
 
 %install
 make install DESTDIR=%{buildroot}%{_prefix}
@@ -176,13 +172,8 @@ install -Dm 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/ppp/chatscripts/modem.cha
 install -Dm 644 %{SOURCE15} %{buildroot}%{_unitdir}/modem@.service
 install -Dm 644 %{SOURCE16} %{buildroot}%{_udevrulesdir}/90-modem.rules
 
-%if 0%{?suse_version} < 1330
-%pre
-getent group %{_group} >/dev/null || %{_sbindir}/groupadd -r %{_group}
-%endif
-
 %files
-%attr(750, root, root) %dir %{_sysconfdir}/ppp
+%attr(0750,root,root) %dir %{_sysconfdir}/ppp
 %dir %{_sysconfdir}/ppp/peers
 %config(noreplace) %{_sysconfdir}/ppp/options
 %config(noreplace) %{_sysconfdir}/ppp/filters
@@ -192,7 +183,7 @@ getent group %{_group} >/dev/null || %{_sbindir}/groupadd -r %{_group}
 %config(noreplace) %{_sysconfdir}/pam.d/ppp
 %doc FAQ README* SETUP scripts PLUGINS
 %{_mandir}/man?/*.?%{ext_man}
-%attr (-, root, dialout) %{_sbindir}/pppd
+%attr(-,root,%{_group}) %{_sbindir}/pppd
 %{_sbindir}/chat
 %{_sbindir}/pppdump
 %{_sbindir}/pppstats