On (23/05/14 17:47), Lukas Slebodnik wrote: >ehlo, > >In theory, it could be possible to build current master without samba >on rhel5, but the spec file would be very complicated. >It is better to simplify spec file. > >Patch is attached. >1 file changed, 43 deletions(-) :-) > >LS The patch lost somewhere.
One more time LS
>From 67dc527e00e2849b846f392b6a4457a9702d056e Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 23 May 2014 17:33:40 +0200 Subject: [PATCH] SPEC: Drop rhel5 conditions in spec file. In theory, it could be possible to build current master without samba on rhel5, but the spec file would be very complicated. It is better to simplify spec file. --- contrib/sssd.spec.in | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 159cd3c83ae25bc11ae10202f9bcb2c8f4b70054..3a1a19a3d5a15aae3dc221ca4d3588e926b51b0d 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -1,22 +1,6 @@ -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - -%global is_rhel5 %(%{__grep} -c "release 5" /etc/redhat-release) -%global rhel5_minor %(%{__grep} -o "5.[0-9]*" /etc/redhat-release |%{__sed} -s 's/5.//') - -%if 0%{?is_rhel5} > 0 -# we don't want to provide private python extension libs -%{?filter_setup: -%filter_provides_in %{python_sitearch}/.*\.so$ -%filter_setup -} -%else # Fedora and RHEL 6+ # we don't want to provide private python extension libs %define __provides_exclude_from %{python_sitearch}/.*\.so$ -%endif %if (0%{?fedora} >= 16 || 0%{?rhel} >= 7) %global use_systemd 1 @@ -84,13 +68,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: m4 -%{?fedora:BuildRequires: popt-devel} -%if 0%{?is_rhel5} > 0 -BuildRequires: popt -%endif -%if 0%{?rhel} >= 6 BuildRequires: popt-devel -%endif BuildRequires: libtalloc-devel BuildRequires: libtevent-devel BuildRequires: libtdb-devel @@ -100,11 +78,7 @@ BuildRequires: libcollection-devel BuildRequires: libini_config-devel BuildRequires: dbus-devel BuildRequires: dbus-libs -%if 0%{?rhel5_minor} >= 7 -BuildRequires: openldap24-libs-devel -%else BuildRequires: openldap-devel -%endif BuildRequires: pam-devel BuildRequires: nss-devel BuildRequires: nspr-devel @@ -139,10 +113,7 @@ BuildRequires: systemd-devel BuildRequires: cifs-utils-devel %endif -# RHEL 5 is too old to support samba4 and the PAC responder -%if !0%{?is_rhel5} BuildRequires: samba4-devel -%endif BuildRequires: libsmbclient-devel %description @@ -258,8 +229,6 @@ Requires: sssd-krb5-common = %{version}-%{release} Provides the Kerberos back end that the SSSD can utilize authenticate against a Kerberos server. -# RHEL 5 is too old to support the PAC responder -%if !0%{?is_rhel5} %package common-pac Summary: Common files needed for supporting PAC processing Group: Applications/System @@ -269,7 +238,6 @@ Requires: sssd-common = %{version}-%{release} %description common-pac Provides common files needed by SSSD providers such as IPA and Active Directory for handling Kerberos PACs. -%endif #is_rhel5 %package ipa Summary: The IPA back end of the SSSD @@ -280,10 +248,7 @@ Requires: sssd-common = %{version}-%{release} Requires: sssd-krb5-common = %{version}-%{release} Requires: libipa_hbac = %{version}-%{release} Requires: bind-utils -# RHEL 5 is too old to support the PAC responder -%if !0%{?is_rhel5} Requires: sssd-common-pac = %{version}-%{release} -%endif %description ipa Provides the IPA back end that the SSSD can utilize to fetch identity data @@ -297,10 +262,7 @@ Conflicts: sssd < %{version}-%{release} Requires: sssd-common = %{version}-%{release} Requires: sssd-krb5-common = %{version}-%{release} Requires: bind-utils -# RHEL 5 is too old to support the PAC responder -%if !0%{?is_rhel5} Requires: sssd-common-pac = %{version}-%{release} -%endif %description ad Provides the Active Directory back end that the SSSD can utilize to fetch @@ -635,13 +597,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libsss_krb5.so %{_mandir}/man5/sssd-krb5.5* -# RHEL 5 is too old to support the PAC responder -%if !0%{?is_rhel5} %files common-pac %defattr(-,root,root,-) %doc COPYING %{_libexecdir}/%{servicename}/sssd_pac -%endif %files ipa -f sssd_ipa.lang @@ -679,9 +638,7 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/libnss_sss.so.2 /%{_lib}/security/pam_sss.so %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so -%if !0%{?is_rhel5} %{_libdir}/krb5/plugins/authdata/sssd_pac_plugin.so -%endif %if (0%{?with_cifs_utils_plugin} == 1) %{_libdir}/cifs-utils/cifs_idmap_sss.so %ghost %{_sysconfdir}/cifs-utils/idmap-plugin -- 1.9.0
_______________________________________________ sssd-devel mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
