From f34223890c3d0bdbbefba4150fb95ec7fd703b87 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 16 Sep 2010 08:09:44 -0400
Subject: Fix assorted specfile issues

1) Pam modules should be explicitly built for /lib64/security
2) The krb5 locator plugin is always built; remove the conditional
3) The krb5 locator plugin belongs in the sssd-client package
4) The sss_obfuscate manpage was not packaged
---
 contrib/sssd.spec.in | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'contrib')

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index a26cf9da..3f6a0f1b 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -100,6 +100,7 @@ service.
     --with-pubconf-path=%{pubconfpath} \
     --with-init-dir=%{_initrddir} \
     --enable-nsslibdir=/%{_lib} \
+    --enable-pammoddir=/%{_lib}/security \
     --disable-static \
     --disable-rpath
 
@@ -143,12 +144,8 @@ rm -f \
     $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la \
     $RPM_BUILD_ROOT/%{python_sitearch}/pysss.la
 
-if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
-then
-    # Apppend this file to the sss_daemon.lang
-    # Older versions of rpmbuild can only handle one -f option
-    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sssd.lang
-fi
+# Older versions of rpmbuild can only handle one -f option
+# So we need to append to the sssd.lang file
 for file in `ls $RPM_BUILD_ROOT/%{python_sitelib}/*.egg-info 2> /dev/null`
 do
     echo %{python_sitelib}/`basename $file` >> sssd.lang
@@ -199,17 +196,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sss_useradd.8*
 %{_mandir}/man8/sss_userdel.8*
 %{_mandir}/man8/sss_usermod.8*
-%{_mandir}/man8/sssd_krb5_locator_plugin.8*
+%{_mandir}/man8/sss_obfuscate.8*
 %{python_sitearch}/pysss.so
 %{python_sitelib}/*.py*
 
-
 %files client
 %defattr(-,root,root,-)
 %doc src/sss_client/COPYING src/sss_client/COPYING.LESSER
 /%{_lib}/libnss_sss.so.2
 /%{_lib}/security/pam_sss.so
+%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
 %{_mandir}/man8/pam_sss.8*
+%{_mandir}/man8/sssd_krb5_locator_plugin.8*
 
 %post
 /sbin/ldconfig
-- 
cgit