From d57d7436e1ddab77e179e6c551834d204ad5312c4b4b85479628761a2dcdd42d Mon Sep 17 00:00:00 2001 From: Howard Guo Date: Fri, 1 Dec 2017 14:37:44 +0000 Subject: [PATCH 1/2] - In an ongoing effort to reduce dependency on python version 2, the following python libraries are no longer built. Nevertheless their python3 counterparts remain in place: * python-ipa_hbac * python-sss-murmur * python-sss_nss_idmap * python-sssd-config OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=191 --- sssd.changes | 11 +++++++++++ sssd.spec | 25 +++---------------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/sssd.changes b/sssd.changes index a664be3..a88f99e 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Dec 1 14:35:08 UTC 2017 - hguo@suse.com + +- In an ongoing effort to reduce dependency on python version 2, + the following python libraries are no longer built. Nevertheless + their python3 counterparts remain in place: + * python-ipa_hbac + * python-sss-murmur + * python-sss_nss_idmap + * python-sssd-config + ------------------------------------------------------------------- Mon Oct 23 16:31:54 UTC 2017 - michael@stroeder.com diff --git a/sssd.spec b/sssd.spec index ffc9710..2e6bb5b 100644 --- a/sssd.spec +++ b/sssd.spec @@ -53,7 +53,6 @@ BuildRequires: nscd BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: pkg-config >= 0.21 -BuildRequires: python-devel BuildRequires: python3-devel BuildRequires: systemd-rpm-macros BuildRequires: libcmocka-devel @@ -76,7 +75,7 @@ BuildRequires: pkgconfig(libpcre) >= 7 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(ndr_nbt) BuildRequires: pkgconfig(popt) -BuildRequires: pkgconfig(python) +BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(talloc) BuildRequires: pkgconfig(tdb) >= 1.1.3 BuildRequires: pkgconfig(tevent) @@ -427,7 +426,8 @@ export LDFLAGS="-pie" --with-semanage=no \ --disable-ldb-version-check \ --without-kcm \ - --without-secrets + --without-secrets \ + --without-python2-bindings make %{?_smp_mflags} all %install @@ -754,39 +754,20 @@ rm -f /var/lib/sss/db/*.ldb %_libdir/libsss_simpleifp.so %_libdir/pkgconfig/sss_simpleifp.pc -%files -n python-ipa_hbac -%defattr(-,root,root) -%dir %python_sitearch -%python_sitearch/pyhbac.so - %files -n python3-ipa_hbac %defattr(-,root,root) %dir %python3_sitearch %python3_sitearch/pyhbac.so -%files -n python-sss-murmur -%defattr(-,root,root) -%python_sitearch/pysss_murmur.so - %files -n python3-sss-murmur %defattr(-,root,root) %python3_sitearch/pysss_murmur.so -%files -n python-sss_nss_idmap -%defattr(-,root,root) -%dir %python_sitearch -%python_sitearch/pysss_nss_idmap.so - %files -n python3-sss_nss_idmap %defattr(-,root,root) %dir %python3_sitearch %python3_sitearch/pysss_nss_idmap.so -%files -n python-sssd-config -%defattr(-,root,root) -%python_sitearch/pysss.so -%python_sitelib/SSSDConfig* - %files -n python3-sssd-config %defattr(-,root,root) %python3_sitearch/pysss.so From f149bbe0673998f2fa7baf8b0d1b5fffac80b3b758e323de429e3ac7f49c57d9 Mon Sep 17 00:00:00 2001 From: Howard Guo Date: Mon, 4 Dec 2017 10:27:54 +0000 Subject: [PATCH 2/2] - Correct dependency of sss_obfuscate command line program. OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=192 --- sssd.changes | 5 +++++ sssd.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sssd.changes b/sssd.changes index a88f99e..fbeb324 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 4 10:03:59 UTC 2017 - hguo@suse.com + +- Correct dependency of sss_obfuscate command line program. + ------------------------------------------------------------------- Fri Dec 1 14:35:08 UTC 2017 - hguo@suse.com diff --git a/sssd.spec b/sssd.spec index 2e6bb5b..eb2d420 100644 --- a/sssd.spec +++ b/sssd.spec @@ -171,7 +171,7 @@ and/or PAM modules to leverage SSSD caching. Summary: Commandline tools for sssd License: GPL-3.0+ and LGPL-3.0+ Group: System/Management -Requires: python-sssd-config = %version +Requires: python3-sssd-config = %version Requires: sssd = %version %py_requires @@ -431,6 +431,9 @@ export LDFLAGS="-pie" make %{?_smp_mflags} all %install +# sss_obfuscate is compatible with both python 2 and 3 +sed -i -e 's:/usr/bin/python:/usr/bin/python3:' src/tools/sss_obfuscate + b="%buildroot" make install DESTDIR="$b"