Kolab Groupware OBS

Changes of Revision 12

mozldap.spec Changed

@@ -23,7 +23,7 @@
 Summary:          Mozilla LDAP C SDK
 Name:             mozldap
 Version:          %{major}.%{minor}.%{submin}
-Release:          8%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/directory/csdk.html
 Group:            System Environment/Libraries
@@ -143,7 +143,10 @@
 # Copy the binaries we want
 for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare ldappasswd
 do
-  %{__install} -m 755 mozilla/dist/bin/$file $RPM_BUILD_ROOT%{_libdir}/%{name}
+  %{__install} -m 755 mozilla/dist/bin/$file $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+  pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
+  ln -s ../../libexec/%{name}/$file $file
+  popd
 done
 
 # Copy the include files
@@ -161,6 +164,14 @@
 %{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldapfilter.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
 %{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldapsearchprefs.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
 
+%pre
+
+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
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -182,6 +193,12 @@
 %files tools
 %defattr(-,root,root,-)
 %dir %{_libdir}/%{name}
+%{_libexecdir}/%{name}/ldapsearch
+%{_libexecdir}/%{name}/ldapmodify
+%{_libexecdir}/%{name}/ldapdelete
+%{_libexecdir}/%{name}/ldapcmp
+%{_libexecdir}/%{name}/ldapcompare
+%{_libexecdir}/%{name}/ldappasswd
 %{_libdir}/%{name}/ldapsearch
 %{_libdir}/%{name}/ldapmodify
 %{_libdir}/%{name}/ldapdelete
@@ -196,6 +213,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Wed Oct 30 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 6.0.5-9
+- Move the commands from a lib_t labeled directory to a bin_t labeled
+  directory.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild