Kolab Groupware OBS

Changes of Revision 14

mozldap.spec Changed

@@ -132,7 +132,9 @@
 # There is no make install target so we'll do it ourselves.
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_includedir}/%{name}
+%if "%{_libexecdir}" != "%{_libdir}"
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+%endif
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 # Copy the binary libraries we want
@@ -145,9 +147,11 @@
 for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare ldappasswd
 do
   %{__install} -m 755 mozilla/dist/bin/$file $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+%if "%{_libexecdir}" != "%{_libdir}"
   pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
   ln -s ../../libexec/%{name}/$file $file
   popd
+%endif
 done
 
 # Copy the include files
@@ -166,12 +170,13 @@
 %{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldapsearchprefs.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
 
 %pre
-
+%if "%{_libexecdir}" != "%{_libdir}"
 for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare ldappasswd; do
     if [ -f "%{_libdir}/%{name}/${file}" -a ! -L "%{_libdir}/%{name}/${file}" ]; then
         rm -rf %{_libdir}/%{name}/${file}
     fi
 done
+%endif
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -200,12 +205,14 @@
 %{_libexecdir}/%{name}/ldapcmp
 %{_libexecdir}/%{name}/ldapcompare
 %{_libexecdir}/%{name}/ldappasswd
+%if "%{_libexecdir}" != "%{_libdir}"
 %{_libdir}/%{name}/ldapsearch
 %{_libdir}/%{name}/ldapmodify
 %{_libdir}/%{name}/ldapdelete
 %{_libdir}/%{name}/ldapcmp
 %{_libdir}/%{name}/ldapcompare
 %{_libdir}/%{name}/ldappasswd
+%endif
 
 %files devel
 %defattr(-,root,root,-)