From 177fd6542bf7c2570a16d5f78f92cfb1ccf73c62f67ecea1248adab4792ebea8 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 10 Nov 2017 14:47:10 +0000
Subject: [PATCH] Accepting request 540166 from
 home:pluskalm:branches:GNOME:Factory

- Build python3 version of bindings as well

OBS-URL: https://build.opensuse.org/request/show/540166
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libpwquality?expand=0&rev=18
---
 libpwquality.changes |  5 ++++
 libpwquality.spec    | 61 +++++++++++++++++++++++++++-----------------
 2 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/libpwquality.changes b/libpwquality.changes
index b964691..1668481 100644
--- a/libpwquality.changes
+++ b/libpwquality.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov  9 09:34:50 UTC 2017 - mpluskal@suse.com
+
+- Build python3 version of bindings as well
+
 -------------------------------------------------------------------
 Fri Apr 15 21:51:14 UTC 2016 - mgorse@suse.com
 
diff --git a/libpwquality.spec b/libpwquality.spec
index 6fa50db..a55170c 100644
--- a/libpwquality.spec
+++ b/libpwquality.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libpwquality
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -18,12 +18,11 @@
 
 %define _pammoduledir /%{_lib}/security
 %define _secconfdir %{_sysconfdir}/security
-
 Name:           libpwquality
 Version:        1.3.0
 Release:        0
 Summary:        Library for password quality checking and generating random passwords
-License:        BSD-3-Clause or GPL-2.0+
+License:        BSD-3-Clause OR GPL-2.0+
 Group:          System/Libraries
 Url:            https://fedorahosted.org/libpwquality/
 Source:         https://fedorahosted.org/releases/l/i/libpwquality/%{name}-%{version}.tar.bz2
@@ -31,9 +30,9 @@ BuildRequires:  cracklib-devel
 BuildRequires:  gettext-devel
 BuildRequires:  pam-devel
 # Needed for pkgconfig() Provides
-BuildRequires:  pkg-config
-BuildRequires:  python-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig
+BuildRequires:  python2-devel
+BuildRequires:  python3-devel
 %lang_package
 
 %description
@@ -67,7 +66,7 @@ This package contains simple tools that use libpwquality.
 Summary:        Library for password quality checking -- Development Files
 Group:          Development/Libraries/C and C++
 Requires:       libpwquality1 = %{version}
-Requires:       pkg-config
+Requires:       pkgconfig
 
 %description devel
 libpwquality is a library for password quality checks and generation
@@ -85,38 +84,56 @@ Requires:       pam
 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 python-pwquality
+%package -n python2-pwquality
 Summary:        Library for password quality checking -- Python bindings
 Group:          Development/Libraries/Python
+Provides:       python-pwquality = %{version}-%{release}
+Obsoletes:      python-pwquality < %{version}-%{release}
 
-%description -n python-pwquality
+%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:        Library for password quality checking -- Python 3 bindings
+Group:          Development/Libraries/Python
+Provides:       python-pwquality = %{version}-%{release}
+Obsoletes:      python-pwquality < %{version}-%{release}
+
+%description -n python3-pwquality
+libpwquality is a library for password quality checks and generation
+of random passwords that pass the checks.
+
+This package provides Python 3 bindings for the libpwquality library.
+
 %prep
 %setup -q
 
 %build
+cp -r python python3
 %configure \
-        --disable-static \
-        --with-securedir=%{_pammoduledir} \
-        --with-pythonsitedir=%{python_sitearch}
+  --disable-static \
+  --with-securedir=%{_pammoduledir} \
+  --with-pythonsitedir=%{python_sitearch}
 make %{?_smp_mflags}
+pushd python3
+%python3_build
+popd
 
 %install
 %make_install
-rm %{buildroot}%{_libdir}/*.la
-rm %{buildroot}%{_pammoduledir}/*.la
+pushd python3
+%python3_install
+popd
+find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name} %{?no_lang_C}
 
 %post -n libpwquality1 -p /sbin/ldconfig
-
 %postun -n libpwquality1 -p /sbin/ldconfig
 
 %files -n libpwquality1
-%defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README
 %{_libdir}/libpwquality.so.*
 %config(noreplace) %{_secconfdir}/pwquality.conf
@@ -124,27 +141,25 @@ rm %{buildroot}%{_pammoduledir}/*.la
 %{_mandir}/man5/pwquality.conf.5%{?ext_man}
 
 %files tools
-%defattr(-,root,root)
 %{_bindir}/pwmake
 %{_bindir}/pwscore
 %{_mandir}/man1/pwmake.1%{?ext_man}
 %{_mandir}/man1/pwscore.1%{?ext_man}
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/pwquality.h
 %{_libdir}/libpwquality.so
 %{_libdir}/pkgconfig/pwquality.pc
 
 %files -n pam_pwquality
-%defattr(-,root,root)
 %{_pammoduledir}/pam_pwquality.so
 %{_mandir}/man8/pam_pwquality.8%{?ext_man}
 
-%files -n python-pwquality
-%defattr(-,root,root)
-%{python_sitearch}/pwquality.so
-%{python_sitearch}/pwquality*egg-info
+%files -n python2-pwquality
+%{python2_sitearch}/*
+
+%files -n python3-pwquality
+%{python3_sitearch}/*
 
 %files lang -f libpwquality.lang