rpms
/
sssd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify spec file a little bit 

The plugin for cifs-utils can be built on all supported versions of fedora.
Conditions are required only in upstream spec file for older
distributions. Definition of constant with_cifs_utils_plugin is still
in the beginning of spec file for simpler comparison of changes
between upstream and fedora.

(cherry picked from commit 5ce8ae1166)
(cherry picked from commit 601bb9f4eb)
(cherry picked from commit 7109e61605)
This commit is contained in:
Lukas Slebodnik 2017-09-01 10:45:12 +02:00
parent 8a5c19cd14
commit d8d7ab916a
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sssd.spec
View File

@ -110,9 +110,7 @@ BuildRequires: uid_wrapper
BuildRequires: nss_wrapper BuildRequires: nss_wrapper
BuildRequires: libnl3-devel BuildRequires: libnl3-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
%if (0%{?with_cifs_utils_plugin} == 1)
BuildRequires: cifs-utils-devel BuildRequires: cifs-utils-devel
%endif
BuildRequires: libnfsidmap-devel BuildRequires: libnfsidmap-devel
BuildRequires: samba4-devel BuildRequires: samba4-devel
BuildRequires: libsmbclient-devel BuildRequires: libsmbclient-devel
@ -655,11 +653,9 @@ install -m644 src/examples/logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/s
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d
install -m644 src/examples/rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/sssd install -m644 src/examples/rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/sssd
%if (0%{?with_cifs_utils_plugin} == 1)
# Create directory for cifs-idmap alternative # Create directory for cifs-idmap alternative
# Otherwise this directory could not be owned by sssd-client # Otherwise this directory could not be owned by sssd-client
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cifs-utils mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cifs-utils
%endif
# Remove .la files created by libtool # Remove .la files created by libtool
find $RPM_BUILD_ROOT -name "*.la" -exec rm -f {} \; find $RPM_BUILD_ROOT -name "*.la" -exec rm -f {} \;
@ -943,12 +939,10 @@ done
%{_libdir}/security/pam_sss.so %{_libdir}/security/pam_sss.so
%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
%{_libdir}/krb5/plugins/authdata/sssd_pac_plugin.so %{_libdir}/krb5/plugins/authdata/sssd_pac_plugin.so
%if (0%{?with_cifs_utils_plugin} == 1)
%dir %{_libdir}/cifs-utils %dir %{_libdir}/cifs-utils
%{_libdir}/cifs-utils/cifs_idmap_sss.so %{_libdir}/cifs-utils/cifs_idmap_sss.so
%dir %{_sysconfdir}/cifs-utils %dir %{_sysconfdir}/cifs-utils
%ghost %{_sysconfdir}/cifs-utils/idmap-plugin %ghost %{_sysconfdir}/cifs-utils/idmap-plugin
%endif
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules %dir %{_libdir}/%{name}/modules
%{_libdir}/%{name}/modules/sssd_krb5_localauth_plugin.so %{_libdir}/%{name}/modules/sssd_krb5_localauth_plugin.so
@ -1174,7 +1168,6 @@ done
%systemd_postun_with_restart sssd-kcm.socket %systemd_postun_with_restart sssd-kcm.socket
%systemd_postun_with_restart sssd-kcm.service %systemd_postun_with_restart sssd-kcm.service
%if (0%{?with_cifs_utils_plugin} == 1)
%post client %post client
/sbin/ldconfig /sbin/ldconfig
/usr/sbin/alternatives --install /etc/cifs-utils/idmap-plugin cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so 20 /usr/sbin/alternatives --install /etc/cifs-utils/idmap-plugin cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so 20
@ -1183,9 +1176,6 @@ done
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
/usr/sbin/alternatives --remove cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so /usr/sbin/alternatives --remove cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so
fi fi
%else
%post client -p /sbin/ldconfig
%endif
%postun client -p /sbin/ldconfig %postun client -p /sbin/ldconfig