SPECS (AC-branch): kdelibs.spec - prefer sudo in kdesu

[glen]

Author: glen                         Date: Sun Oct 15 14:39:43 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- prefer sudo in kdesu

---- Files affected:
SPECS:
   kdelibs.spec (1.448.2.9 -> 1.448.2.10) 

---- Diffs:

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.448.2.9 SPECS/kdelibs.spec:1.448.2.10
--- SPECS/kdelibs.spec:1.448.2.9	Wed Oct 11 00:15:11 2006
+++ SPECS/kdelibs.spec	Sun Oct 15 16:39:38 2006
@@ -22,7 +22,7 @@
 Summary(uk):	K Desktop Environment - âŚÂĚŚĎÔĹËÉ
 Name:		kdelibs
 Version:	3.5.5
-Release:	0.5
+Release:	0.9
 Epoch:		9
 License:	LGPL
 Group:		X11/Libraries
@@ -161,7 +161,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # confuses OpenEXR detection
-%undefine	with_confcache
+%undefine	configure_cache
 
 %description
 This package includes libraries that are central to the development
@@ -343,12 +343,15 @@
 %patch7 -p1
 %patch8 -p1
 
-%build
-cp %{_datadir}/automake/config.sub admin
+rm -f configure
+cp /usr/share/automake/config.sub admin
 
+%build
 export kde_htmldir=%{_kdedocdir}
 export kde_libs_htmldir=%{_kdedocdir}
-%{__make} -f admin/Makefile.common cvs
+if [ ! -f configure ]; then
+	%{__make} -f admin/Makefile.common cvs
+fi
 
 export path_sudo=/usr/bin/sudo
 %configure \
@@ -364,7 +367,8 @@
 	--with-distribution="PLD Linux Distribution" \
 	--with-ldap=no \
 	--with-lua-includes=%{_includedir}/lua50 \
-	--with-qt-libraries=%{_libdir}
+	--with-qt-libraries=%{_libdir} \
+	--with-sudo-kdesu-backend
 
 %{__make}
 %{?with_apidocs:%{__make} apidox}
@@ -395,14 +399,14 @@
 
 # For fileshare
 touch $RPM_BUILD_ROOT/etc/security/fileshare.conf
-%{__sed} -i -e "s|/etc/init.d|/etc/rc.d/init.d|g" $RPM_BUILD_ROOT%{_bindir}/fileshare*
+%{__sed} -i -e 's|/etc/init.d|/etc/rc.d/init.d|g' $RPM_BUILD_ROOT%{_bindir}/fileshare*
 
-if [ -d "$RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs" ] ; then
+if [ -d $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs ] ; then
 	mv -f $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-{%{version}-,}apidocs
 fi
 
 # packaged by hicolor-icon-theme
-rm -f $RPM_BUILD_ROOT%{_iconsdir}/hicolor/index.theme
+rm $RPM_BUILD_ROOT%{_iconsdir}/hicolor/index.theme
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -992,6 +996,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.448.2.10  2006/10/15 14:39:38  glen
+- prefer sudo in kdesu
+
 Revision 1.448.2.9  2006/10/10 22:15:11  glen
 - KDE 3.5.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.448.2.9&r2=1.448.2.10&f=u