Accepting request 548039 from network:ldap

- Correct dependency of sss_obfuscate command line program.

- 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/request/show/548039
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sssd?expand=0&rev=85
This commit is contained in:
Dominique Leuenberger 2017-12-08 20:46:42 +00:00 committed by Git OBS Bridge
commit 3349cd9021
2 changed files with 23 additions and 23 deletions

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
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
- 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

View File

@ -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)
@ -172,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
@ -427,10 +426,14 @@ export LDFLAGS="-pie"
--with-semanage=no \
--disable-ldb-version-check \
--without-kcm \
--without-secrets
--without-secrets \
--without-python2-bindings
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"
@ -754,39 +757,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