[packages/system-tools-backends] Rel 7 (shadow has required options)

[arekm]

commit 7de52f1b51996e54e21d70f81c302a7574a10a6a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Mar 14 12:56:36 2026 +0100

    Rel 7 (shadow has required options)

 system-tools-backends-incompatible-gpasswd.patch | 27 ------------------------
 system-tools-backends-logindefs.patch            | 14 ++++++------
 system-tools-backends.spec                       |  4 +---
 3 files changed, 8 insertions(+), 37 deletions(-)
---
diff --git a/system-tools-backends.spec b/system-tools-backends.spec
index f99a6bf..f098f36 100644
--- a/system-tools-backends.spec
+++ b/system-tools-backends.spec
@@ -2,13 +2,12 @@ Summary:	GNOME System Tools backends
 Summary(pl.UTF-8):	Backendy GNOME System Tools (narzędzi systemowych GNOME)
 Name:		system-tools-backends
 Version:	2.10.2
-Release:	6
+Release:	7
 License:	LGPL v2+
 Group:		Applications/System
 Source0:	https://download.gnome.org/sources/system-tools-backends/2.10/%{name}-%{version}.tar.bz2
 # Source0-md5:	edae148b31342aecae035051adc70c74
 Patch0:		%{name}-logindefs.patch
-Patch1:		%{name}-incompatible-gpasswd.patch
 URL:		https://gitlab.gnome.org/Archive/system-tools-backends
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -58,7 +57,6 @@ backendami GNOME System Tools (narzędzi systemowych GNOME).
 %prep
 %setup -q
 %patch -P0 -p1
-%patch -P1 -p1
 
 %build
 %{__intltoolize}
diff --git a/system-tools-backends-incompatible-gpasswd.patch b/system-tools-backends-incompatible-gpasswd.patch
deleted file mode 100644
index 83c12a2..0000000
--- a/system-tools-backends-incompatible-gpasswd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN system-tools-backends-2.4.1/Users/Groups.pm system-tools-backends-2.4.1.new/Users/Groups.pm
---- system-tools-backends-2.4.1/Users/Groups.pm	2006-10-05 14:27:21.000000000 +0200
-+++ system-tools-backends-2.4.1.new/Users/Groups.pm	2007-11-01 00:06:05.000000000 +0100
-@@ -85,6 +85,11 @@
- 
-     $command = "$cmd_usermod -G $groups $user";
-   }
-+  # gpasswd from pwdutils has no -a option
-+  elsif ($Utils::Backend::tool{"platform"} eq "pld-1.0")
-+  {
-+    $command = "$cmd_groupmod -A \'" . $user ."\' \'" . $group . "\'";
-+  }
-   else
-   {
-     $command = "$cmd_gpasswd -a \'" . $user . "\' " . $group;
-@@ -118,6 +123,11 @@
-     
-     $command = "$cmd_usermod -G $groups $user";
-   }
-+  # gpasswd from pwdutils has no -d option
-+  elsif ($Utils::Backend::tool{"platform"} eq "pld-1.0")
-+  {
-+    $command = "$cmd_groupmod -R \'" . $user ."\' \'" . $group . "\'";
-+  }
-   else
-   {
-     $command = "$cmd_gpasswd -d \'" . $user . "\' \'" . $group . "\'";
diff --git a/system-tools-backends-logindefs.patch b/system-tools-backends-logindefs.patch
index b3f2b99..241859d 100644
--- a/system-tools-backends-logindefs.patch
+++ b/system-tools-backends-logindefs.patch
@@ -1,10 +1,10 @@
-diff -urN system-tools-backends-2.3.2/Users/Users.pm system-tools-backends-2.3.2.new/Users/Users.pm
---- system-tools-backends-2.3.2/Users/Users.pm	2006-10-05 14:27:21.000000000 +0200
-+++ system-tools-backends-2.3.2.new/Users/Users.pm	2007-09-10 22:54:28.000000000 +0200
-@@ -226,6 +226,13 @@
+diff -urN system-tools-backends-2.10.2/Users/Users.pm system-tools-backends-2.10.2.new/Users/Users.pm
+--- system-tools-backends-2.10.2/Users/Users.pm.orig	2006-10-05 14:27:21.000000000 +0200
++++ system-tools-backends-2.10.2/Users/Users.pm	2007-09-10 22:54:28.000000000 +0200
+@@ -233,6 +233,13 @@
    'skel_dir' => '/etc/skel/',
  };
- 
+
 +my $pld_logindefs_defaults = {
 +  'home_prefix' => '/home/users/',
 +  'shell'    => '/bin/bash',
@@ -15,12 +15,12 @@ diff -urN system-tools-backends-2.3.2/Users/Users.pm system-tools-backends-2.3.2
  my $logindefs_dist_map = {
    'redhat-6.2'      => $rh_logindefs_defaults,
    'redhat-7.0'      => $rh_logindefs_defaults,
-@@ -234,7 +241,7 @@
+@@ -241,7 +248,7 @@
    'redhat-7.3'      => $rh_logindefs_defaults,
    'redhat-8.0'      => $rh_logindefs_defaults,
    'mandrake-9.0'    => $rh_logindefs_defaults,
 -  'pld-1.0'         => $rh_logindefs_defaults,
 +  'pld-1.0'         => $pld_logindefs_defaults,
    'fedora-1'        => $rh_logindefs_defaults,
-   'debian-3.0'      => $rh_logindefs_defaults,
+   'debian'          => $rh_logindefs_defaults,
    'vine-3.0'        => $rh_logindefs_defaults,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/system-tools-backends.git/commitdiff/7de52f1b51996e54e21d70f81c302a7574a10a6a