SPECS: kdelibs.spec - AC-branch merge

[glen]

Author: glen                         Date: Wed Oct 25 21:32:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   kdelibs.spec (1.479 -> 1.480) 

---- Diffs:

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.479 SPECS/kdelibs.spec:1.480
--- SPECS/kdelibs.spec:1.479	Thu Oct 12 22:20:09 2006
+++ SPECS/kdelibs.spec	Wed Oct 25 23:32:32 2006
@@ -163,7 +163,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
@@ -348,13 +348,17 @@
 %patch8 -p1
 %patch9 -p1
 
-%build
+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 \
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	%{!?debug:--disable-rpath} \
@@ -368,7 +372,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}
@@ -996,6 +1001,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.480  2006/10/25 21:32:32  glen
+- AC-branch merge
+
 Revision 1.479  2006/10/12 20:20:09  arekm
 - rel 1
 
================================================================

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