From 1942c38a98e9a467dd7d8d26e7efdf14a9a188ea3fe0207474b35637c705635e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 18 Dec 2024 16:15:28 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main libpwquality revision
 7ab98044f3744f39a48ab7ffab8991b5

---
 baselibs.conf        |  1 +
 libpwquality.changes | 13 +++++++++++++
 libpwquality.spec    | 41 +++++------------------------------------
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index 7ed330c..62ab71f 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,5 +1,6 @@
 pam_pwquality
   requires "pam-<targettype>"
+  prereq "pam-config"
   supplements "packageand(pam_pwquality:pam-<targettype>)"
   post "%{_sbindir}/pam-config -a --pwquality || :"
 libpwquality1
diff --git a/libpwquality.changes b/libpwquality.changes
index dbc72d1..48f0e7c 100644
--- a/libpwquality.changes
+++ b/libpwquality.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Nov 22 08:58:19 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- Drop python 2.x support (it's been 4 years).
+- Add python3-setuptools BuildRequires which is needed for
+  distutils.
+
+-------------------------------------------------------------------
+Wed Dec 20 19:23:49 UTC 2023 - Giacomo Comes <gcomes.obs@gmail.com>
+
+- add: prereq "pam-config" in baselibs.conf
+  * post scriptlet in pam_pwquality-32bit runs: pam-config
+
 -------------------------------------------------------------------
 Mon Dec 26 10:03:04 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/libpwquality.spec b/libpwquality.spec
index b6c5309..1a657d7 100644
--- a/libpwquality.spec
+++ b/libpwquality.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libpwquality
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,6 @@
 
 %define _secconfdir %{_sysconfdir}/security
 %define libname libpwquality1
-%bcond_without python2
 
 Name:           libpwquality
 Version:        1.4.5
@@ -34,11 +33,9 @@ BuildRequires:  cracklib-devel
 BuildRequires:  gettext-devel
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(python3)
-%if %{with python2}
-BuildRequires:  pkgconfig(python2)
-%endif
 BuildRequires:  python-rpm-macros
+BuildRequires:  python3-setuptools
+BuildRequires:  pkgconfig(python3)
 
 %description
 libpwquality is a library for password quality checks and generation
@@ -86,24 +83,12 @@ Summary:        PAM module to disallow weak new passwords
 Group:          System/Libraries
 Requires:       pam
 Requires(post): pam-config
-Requires(postun):pam-config
+Requires(postun): pam-config
 
 %description -n pam_pwquality
 The pam_pwquality PAM module can be used instead of pam_cracklib to
 disallow weak new passwords when user's login password is changed.
 
-%package -n python2-pwquality
-Summary:        Python bindings for libpwquality
-Group:          Development/Libraries/Python
-Provides:       python-pwquality = %{version}-%{release}
-Obsoletes:      python-pwquality < %{version}-%{release}
-
-%description -n python2-pwquality
-libpwquality is a library for password quality checks and generation
-of random passwords that pass the checks.
-
-This package provides Python bindings for the libpwquality library.
-
 %package -n python3-pwquality
 Summary:        Python 3 bindings for libpwquality
 Group:          Development/Libraries/Python
@@ -131,20 +116,9 @@ make -O %{?_smp_mflags}
 %else
 %make_build
 %endif
-%if %{with python2}
-pushd python
-%python_build
-popd
-%endif
 
 %install
 %make_install
-%if %{with python2}
-pushd python
-%python_install
-popd
-%endif
-
 find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name} %{?no_lang_C}
 
@@ -184,13 +158,8 @@ fi
 %{_pam_moduledir}/pam_pwquality.so
 %{_mandir}/man8/pam_pwquality.8%{?ext_man}
 
-%if %{with python2}
-%files -n python2-pwquality
-%{python2_sitearch}/*
-%endif
-
 %files -n python3-pwquality
-%{python3_sitearch}/*
+%{python3_sitearch}/pwquality-%{version}-py3*-linux-*.egg
 
 %files lang -f libpwquality.lang