From f0fb853fd36f2220f854b5601b518aa9bc15a921 Mon Sep 17 00:00:00 2001 From: Liquor <1692257904@qq.com> Date: Sat, 31 Oct 2020 17:08:11 +0800 Subject: [PATCH] remove python2 --- sssd.spec | 49 +++++++------------------------------------------ 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/sssd.spec b/sssd.spec index 00cc5c2..10b0d05 100644 --- a/sssd.spec +++ b/sssd.spec @@ -1,13 +1,13 @@ Name: sssd Version: 2.2.3 -Release: 3 +Release: 4 Summary: System Security Services Daemon License: GPLv3+ and LGPLv3+ URL: https://pagure.io/SSSD/sssd/ Source0: https://releases.pagure.org/SSSD/sssd/%{name}-%{version}.tar.gz Patch0: sssd-BUILD-Accept-krb5-1.18-for-building-the-PAC-plu.patch -patch1: 0001-Fix-build-failure-against-samba-4.12.0rc1.patch +Patch1: 0001-Fix-build-failure-against-samba-4.12.0rc1.patch Requires: python3-sssd = %{version}-%{release} Requires: libldb @@ -83,7 +83,7 @@ BuildRequires: autoconf automake libtool m4 gcc popt-devel libtalloc-devel libte BuildRequires: libtdb-devel libldb-devel libdhash-devel libcollection-devel BuildRequires: libini_config-devel dbus-devel dbus-libs openldap-devel pam-devel BuildRequires: nss-devel nspr-devel pcre-devel libxslt libxml2 docbook-style-xsl -BuildRequires: krb5-devel c-ares-devel python2-devel python3-devel check-devel +BuildRequires: krb5-devel c-ares-devel python3-devel check-devel BuildRequires: doxygen libselinux-devel libsemanage-devel bind-utils keyutils-libs-devel BuildRequires: gettext-devel pkgconfig diffstat findutils glib2-devel selinux-policy-targeted BuildRequires: libcmocka-devel uid_wrapper nss_wrapper libnl3-devel systemd-devel systemd @@ -121,32 +121,6 @@ Obsoletes: sssd-libwbclient-devel %description devel Development libraries for the SSSD -%package -n python2-sssd -Summary: Python2 bindings for sssd -License: LGPLv3+ -Requires: sssd = %{version}-%{release} -Provides: python2-sss -Provides: python2-sssdconfig -Provides: python2-sss-murmur -Provides: python2-libipa_hbac -Provides: python2-libsss_nss_idmap -Obsoletes: python2-sss -Obsoletes: python2-sssdconfig -Obsoletes: python2-sss-murmur -Obsoletes: python2-libipa_hbac -Obsoletes: python2-libsss_nss_idmap -Provides: libipa_hbac-python = %{version}-%{release} -Provides: libsss_nss_idmap-python = %{version}-%{release} -%{?python_provide:%python_provide python2-sssd} -%{?python_provide:%python_provide python2-sss} -%{?python_provide:%python_provide python2-sssdconfig} -%{?python_provide:%python_provide python2-sss-murmur} -%{?python_provide:%python_provide python2-libipa_hbac} -%{?python_provide:%python_provide python2-libsss_nss_idmap} - -%description -n python2-sssd -Python2 bindings for sssd - %package -n python3-sssd Summary: Python3 bindings for sssd License: LGPLv3+ @@ -196,6 +170,7 @@ autoreconf -ivf --with-initscript=systemd \ --with-syslog=journald \ --with-crypto=libcrypto \ + --without-python2-bindings \ --enable-sss-default-nss-plugin \ --enable-files-domain \ %{?with_cifs_utils_plugin_option} \ @@ -232,11 +207,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cifs-utils %delete_la -for file in `ls $RPM_BUILD_ROOT/%{python2_sitelib}/*.egg-info 2> /dev/null` -do - echo %{python2_sitelib}/`basename $file` >> python2_sssd.lang -done - for file in `ls $RPM_BUILD_ROOT/%{python3_sitelib}/*.egg-info 2> /dev/null` do echo %{python3_sitelib}/`basename $file` >> python3_sssd.lang @@ -484,14 +454,6 @@ done %{_libdir}/%{name}/modules/libwbclient.so %{_libdir}/pkgconfig/wbclient_sssd.pc -%files -n python2-sssd -f python2_sssd.lang -%dir %{python2_sitelib}/SSSDConfig -%{python2_sitelib}/SSSDConfig/*.py* -%{python2_sitearch}/pysss.so -%{python2_sitearch}/pysss_murmur.so -%{python2_sitearch}/pysss_nss_idmap.so -%{python2_sitearch}/pyhbac.so - %files -n python3-sssd -f python3_sssd.lang %dir %{python3_sitelib}/SSSDConfig %{python3_sitelib}/SSSDConfig/*.py* @@ -579,6 +541,9 @@ fi %{_libdir}/%{name}/modules/libwbclient.so %changelog +* Thu Oct 29 2020 panxiaohe - 2.2.3-4 +- remove subpackage python2-sssd + * Sat Sep 19 2020 Liquor - 2.2.3-3 - install default sssd.conf file -- Gitee