From c714985a2e14d26aad9bc1daa0aaaf1b6e813c46979ea02f29de24a654ecc7f2 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Mon, 15 Aug 2022 17:45:21 +0000
Subject: [PATCH] - Update to 4.12.1:   * Fix uk manpages - Remove
 shadow-4.12-remove-uk.patch: fixed upstream

OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=123
---
 shadow-4.12-remove-uk.patch | 12 ------------
 shadow-4.12.1.tar.xz        |  3 +++
 shadow-4.12.1.tar.xz.asc    | 11 +++++++++++
 shadow-4.12.tar.xz          |  3 ---
 shadow-4.12.tar.xz.asc      | 11 -----------
 shadow.changes              |  7 +++++++
 shadow.spec                 |  5 +----
 7 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 shadow-4.12-remove-uk.patch
 create mode 100644 shadow-4.12.1.tar.xz
 create mode 100644 shadow-4.12.1.tar.xz.asc
 delete mode 100644 shadow-4.12.tar.xz
 delete mode 100644 shadow-4.12.tar.xz.asc

diff --git a/shadow-4.12-remove-uk.patch b/shadow-4.12-remove-uk.patch
deleted file mode 100644
index a5ce35e..0000000
--- a/shadow-4.12-remove-uk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: shadow-4.12/configure.ac
-===================================================================
---- shadow-4.12.orig/configure.ac
-+++ shadow-4.12/configure.ac
-@@ -720,7 +720,6 @@ AC_CONFIG_FILES([
- 	man/ru/Makefile
- 	man/sv/Makefile
- 	man/tr/Makefile
--	man/uk/Makefile
- 	man/zh_CN/Makefile
- 	man/zh_TW/Makefile
- 	libmisc/Makefile
diff --git a/shadow-4.12.1.tar.xz b/shadow-4.12.1.tar.xz
new file mode 100644
index 0000000..7bc484a
--- /dev/null
+++ b/shadow-4.12.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7102c7cc423bfb76532a8590c85db610e28555e2e29d00ae1330097569c1dc8
+size 1745968
diff --git a/shadow-4.12.1.tar.xz.asc b/shadow-4.12.1.tar.xz.asc
new file mode 100644
index 0000000..2a39742
--- /dev/null
+++ b/shadow-4.12.1.tar.xz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEqb0/8XByttt4D8+UNXDaFycKziQFAmL6gNkACgkQNXDaFycK
+ziQIkggAw7OANqSfYO/5ZrU4dkjjhqwZBvMQh3kKNQZ9fBst2+6eVvkWNyQTorMX
+YUnvEgCFJA1wj2o4gltfaYWEVIkDgpwkexKEzPx02n70oe+sbAukXUcXo4v/8piP
+D6Q1qLpW1z1vZFp4ZaIj4CP/aa4mTzMNeCWwRn+bCeDLR8jwhwmDN54hEZJ83psB
+6RhJXxtUyb6fOI0EK8yRlctuPt39LVAXBO3Q265fmFxP/THEBCseNr6G/+dvR0eQ
+ntLGJsBuAE647WN0CYynJl6Jq8ehGaNnmlQOU0reRnxvT+Mx0dkP9Vk2AoENGDL2
+D6C+/9v3fpyuyIxWotBK4SenyqKVHA==
+=AJ3H
+-----END PGP SIGNATURE-----
diff --git a/shadow-4.12.tar.xz b/shadow-4.12.tar.xz
deleted file mode 100644
index 12fafc1..0000000
--- a/shadow-4.12.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd4cb17c169b16959264f62f3a9deca908dc63908a61d43a8bfef6c23bb1e738
-size 1730308
diff --git a/shadow-4.12.tar.xz.asc b/shadow-4.12.tar.xz.asc
deleted file mode 100644
index 0a1cba5..0000000
--- a/shadow-4.12.tar.xz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEqb0/8XByttt4D8+UNXDaFycKziQFAmL1KjQACgkQNXDaFycK
-ziTYtgf/RVJymnEGRbZt21UAU4jy2q99AdaeVogiQhADwy5sJkmSxjf1NSau1wio
-o/pajAuvt9M74gv6N8tJIAvTYTBVLSgNMlgdUbM+N5tdJdt2eJ/igvvHan9IND0h
-+8aoAwUjkDPpQVGUeA+b3DELqpGGwz5aqdgDOD8LoEPuZWFwj10BoVBuN6bo2ODS
-m825TnS2ur1PHYPu9oTMhG9LeNdvXZpaIhkbsyOuIcnmEdE+yKYVq807V5bf5Que
-Ygd3FP3Eec/Mb/CHGufQY4VzzCMVSBpVGK+mIFgWu4qefxBvOcqOxL6llaaKT3LN
-oStVlIlpwRDp0rA5gOGmL/+61kU3Sw==
-=vfQ5
------END PGP SIGNATURE-----
diff --git a/shadow.changes b/shadow.changes
index 8184891..92e770d 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 15 17:42:01 UTC 2022 - Michael Vetter <mvetter@suse.com>
+
+- Update to 4.12.1:
+  * Fix uk manpages
+- Remove shadow-4.12-remove-uk.patch: fixed upstream
+
 -------------------------------------------------------------------
 Fri Aug 12 06:05:35 UTC 2022 - Michael Vetter <mvetter@suse.com>
 
diff --git a/shadow.spec b/shadow.spec
index 3231d0f..4fdf4d6 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -22,7 +22,7 @@
   %define no_config 1
 %endif
 Name:           shadow
-Version:        4.12
+Version:        4.12.1
 Release:        0
 Summary:        Utilities to Manage User and Group Accounts
 License:        BSD-3-Clause AND GPL-2.0-or-later
@@ -59,8 +59,6 @@ Patch7:         shadow-login_defs-suse.patch
 Patch8:         useradd-userkeleton.patch
 # PATCH-FIX-SUSE disable_new_audit_function.patch adam.majer@suse.de -- Disable newer libaudit functionality for older distributions.
 Patch9:         disable_new_audit_function.patch
-# PATCH-FIX-UPSTREAM mvetter@suse.com -- Disable non working Ukranian translation for now (https://github.com/shadow-maint/shadow/issues/547)
-Patch10:        shadow-4.12-remove-uk.patch
 BuildRequires:  audit-devel > 2.3
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -131,7 +129,6 @@ Development files for libsubid4.
 %if 0%{?suse_version} < 1330
 %patch9 -p1
 %endif
-%patch10 -p1
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 mv -v doc/HOWTO.utf8 doc/HOWTO