|
 |
1cdfb00 |
From eca9ad01d4e5e6e90ee7b6eeec36f6425308c21a Mon Sep 17 00:00:00 2001
|
|
|
7df2c15 |
From: Lukas Slebodnik <lslebodn@redhat.com>
|
|
|
7df2c15 |
Date: Tue, 10 Feb 2015 18:07:05 +0100
|
|
|
1cdfb00 |
Subject: [PATCH 98/99] SPEC: Replace python_ macros with python2_
|
|
|
7df2c15 |
|
|
|
7df2c15 |
Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
|
|
|
7df2c15 |
---
|
|
|
7df2c15 |
contrib/sssd.spec.in | 34 ++++++++++++++++++++--------------
|
|
|
7df2c15 |
1 file changed, 20 insertions(+), 14 deletions(-)
|
|
|
7df2c15 |
|
|
|
7df2c15 |
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
|
|
|
1cdfb00 |
index 847b6cf2a36f5323cdfad77dd5ef5772b261c2b9..2640c806b5c34479bea5d7d3bc19dba18f9afbad 100644
|
|
|
7df2c15 |
--- a/contrib/sssd.spec.in
|
|
|
7df2c15 |
+++ b/contrib/sssd.spec.in
|
|
|
7df2c15 |
@@ -1,8 +1,14 @@
|
|
|
7df2c15 |
%global rhel7_minor %(%{__grep} -o "7.[0-9]*" /etc/redhat-release |%{__sed} -s 's/7.//')
|
|
|
7df2c15 |
|
|
|
7df2c15 |
+%if 0%{?rhel} && 0%{?rhel} <= 6
|
|
|
7df2c15 |
+%{!?__python2: %global __python2 /usr/bin/python2}
|
|
|
7df2c15 |
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
|
|
7df2c15 |
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
|
|
7df2c15 |
+%endif
|
|
|
7df2c15 |
+
|
|
|
7df2c15 |
# Fedora and RHEL 6+
|
|
|
7df2c15 |
# we don't want to provide private python extension libs
|
|
|
7df2c15 |
-%define __provides_exclude_from %{python_sitearch}/.*\.so$
|
|
|
7df2c15 |
+%define __provides_exclude_from %{python2_sitearch}/.*\.so$
|
|
|
7df2c15 |
|
|
|
7df2c15 |
%if (0%{?fedora} || 0%{?rhel} >= 7)
|
|
|
7df2c15 |
%global use_systemd 1
|
|
|
7df2c15 |
@@ -528,9 +534,9 @@ rm -Rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}
|
|
|
7df2c15 |
|
|
|
7df2c15 |
# Older versions of rpmbuild can only handle one -f option
|
|
|
7df2c15 |
# So we need to append to the sssd*.lang file
|
|
|
7df2c15 |
-for file in `ls $RPM_BUILD_ROOT/%{python_sitelib}/*.egg-info 2> /dev/null`
|
|
|
7df2c15 |
+for file in `ls $RPM_BUILD_ROOT/%{python2_sitelib}/*.egg-info 2> /dev/null`
|
|
|
7df2c15 |
do
|
|
|
7df2c15 |
- echo %{python_sitelib}/`basename $file` >> python_sssdconfig.lang
|
|
|
7df2c15 |
+ echo %{python2_sitelib}/`basename $file` >> python2_sssdconfig.lang
|
|
|
7df2c15 |
done
|
|
|
7df2c15 |
|
|
|
7df2c15 |
touch sssd.lang
|
|
|
7df2c15 |
@@ -773,20 +779,20 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
7df2c15 |
%{_mandir}/man8/sss_debuglevel.8*
|
|
|
7df2c15 |
%{_mandir}/man8/sss_seed.8*
|
|
|
7df2c15 |
|
|
|
7df2c15 |
-%files -n python-sssdconfig -f python_sssdconfig.lang
|
|
|
7df2c15 |
+%files -n python-sssdconfig -f python2_sssdconfig.lang
|
|
|
7df2c15 |
%defattr(-,root,root,-)
|
|
|
7df2c15 |
-%dir %{python_sitelib}/SSSDConfig
|
|
|
7df2c15 |
-%{python_sitelib}/SSSDConfig/*.py*
|
|
|
7df2c15 |
+%dir %{python2_sitelib}/SSSDConfig
|
|
|
7df2c15 |
+%{python2_sitelib}/SSSDConfig/*.py*
|
|
|
7df2c15 |
|
|
|
7df2c15 |
%files -n python-sss
|
|
|
7df2c15 |
%defattr(-,root,root,-)
|
|
|
7df2c15 |
-%{python_sitearch}/pysss.so
|
|
|
7df2c15 |
-%{python_sitearch}/_py2sss.so
|
|
|
7df2c15 |
+%{python2_sitearch}/pysss.so
|
|
|
7df2c15 |
+%{python2_sitearch}/_py2sss.so
|
|
|
7df2c15 |
|
|
|
7df2c15 |
%files -n python-sss-murmur
|
|
|
7df2c15 |
%defattr(-,root,root,-)
|
|
|
7df2c15 |
-%{python_sitearch}/pysss_murmur.so
|
|
|
7df2c15 |
-%{python_sitearch}/_py2sss_murmur.so
|
|
|
7df2c15 |
+%{python2_sitearch}/pysss_murmur.so
|
|
|
7df2c15 |
+%{python2_sitearch}/_py2sss_murmur.so
|
|
|
7df2c15 |
|
|
|
7df2c15 |
%files -n libsss_idmap
|
|
|
7df2c15 |
%defattr(-,root,root,-)
|
|
|
7df2c15 |
@@ -826,13 +832,13 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
7df2c15 |
|
|
|
7df2c15 |
%files -n python-libsss_nss_idmap
|
|
|
7df2c15 |
%defattr(-,root,root,-)
|
|
|
7df2c15 |
-%{python_sitearch}/pysss_nss_idmap.so
|
|
|
7df2c15 |
-%{python_sitearch}/_py2sss_nss_idmap.so
|
|
|
7df2c15 |
+%{python2_sitearch}/pysss_nss_idmap.so
|
|
|
7df2c15 |
+%{python2_sitearch}/_py2sss_nss_idmap.so
|
|
|
7df2c15 |
|
|
|
7df2c15 |
%files -n python-libipa_hbac
|
|
|
7df2c15 |
%defattr(-,root,root,-)
|
|
|
7df2c15 |
-%{python_sitearch}/pyhbac.so
|
|
|
7df2c15 |
-%{python_sitearch}/_py2hbac.so
|
|
|
7df2c15 |
+%{python2_sitearch}/pyhbac.so
|
|
|
7df2c15 |
+%{python2_sitearch}/_py2hbac.so
|
|
|
7df2c15 |
|
|
|
7df2c15 |
%files libwbclient
|
|
|
7df2c15 |
%defattr(-,root,root,-)
|
|
|
7df2c15 |
--
|
|
|
1cdfb00 |
2.4.0
|
|
|
7df2c15 |
|