SPECS: kdebase.spec - updates; some patches fixed

[arekm]

Author: arekm                        Date: Sun Nov 13 21:38:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updates; some patches fixed

---- Files affected:
SPECS:
   kdebase.spec (1.467 -> 1.468) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.467 SPECS/kdebase.spec:1.468
--- SPECS/kdebase.spec:1.467	Sun Nov 13 02:34:54 2005
+++ SPECS/kdebase.spec	Sun Nov 13 22:38:48 2005
@@ -1028,18 +1028,14 @@
 #%patch100 -p0
 %patch0 -p1
 %patch1 -p1
-# FIXME, APPLIES BUT BROKEN COMPILATION
-# %patch2 -p1
+%patch2 -p1
 %patch3 -p1
-# FIXME, APPLIES BUT BROKEN COMPILATION
-# %patch4 -p1
-#%patch5 -p1
-# FIXME
+%patch4 -p1
+%patch5 -p1
+# DROPME?
 # %patch6 -p1
-# FIXME
-# %patch7 -p1
-# FIXME
-# %patch8 -p1
+%patch7 -p1
+%patch8 -p1
 #%patch9 -p1
 %patch10 -p1
 %patch12 -p1
@@ -1050,8 +1046,7 @@
 %patch18 -p1
 # FIXME
 #%patch19 -p1
-# FIXME
-#%patch20 -p1
+%patch20 -p1
 %patch21 -p1
 
 cd kcontrol/ebrowsing/plugins/ikws/searchproviders
@@ -1146,6 +1141,7 @@
 
 
 %configure \
+	--enable-final \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
@@ -1196,11 +1192,10 @@
 install %{SOURCE5}	$RPM_BUILD_ROOT/etc/X11/kdm/Xsession
 install %{SOURCE6}	$RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/pldlogo.png
 install %{SOURCE7}	$RPM_BUILD_ROOT%{_datadir}/wallpapers/kdm_pld.png
-# need to move this out!
-#%{__tar} xfj %{SOURCE8} -C $RPM_BUILD_ROOT%{_datadir}/services/searchproviders/
-#%{__tar} xfj %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/
-#mv $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/scripts/* $RPM_BUILD_ROOT%{_bindir}
-#rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/scripts
+%{__tar} xfj %{SOURCE8} -C $RPM_BUILD_ROOT%{_datadir}/services/searchproviders/
+%{__tar} xfj %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/
+mv $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/scripts/* $RPM_BUILD_ROOT%{_bindir}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/scripts
 
 # Needed for pam support
 touch $RPM_BUILD_ROOT/etc/security/blacklist.kdm
@@ -2528,15 +2523,14 @@
 %attr(0640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.kdm
 %attr(0754,root,root) /etc/rc.d/init.d/kdm
 %dir /etc/X11/kdm
-# FIXME: include again after fixing kdebase-kdmconfig.patch
-#%config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/kdmrc
-#%config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/backgroundrc
-#%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xreset
+%config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/kdmrc
+%config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/backgroundrc
+%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xreset
 %attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xsession
-#%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xsetup
-#%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xstartup
-#%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xwilling
-#%config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xaccess
+%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xsetup
+%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xstartup
+%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xwilling
+%config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xaccess
 #%config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/Xservers
 %dir /etc/X11/kdm/faces
 %config(noreplace) %verify(not size mtime md5) /etc/X11/kdm/faces/.default.face.icon
@@ -2861,6 +2855,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.468  2005/11/13 21:38:48  arekm
+- updates; some patches fixed
+
 Revision 1.467  2005/11/13 01:34:54  arekm
 - partial update to 3.5.0rc1 (a lot of work still needed)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.467&r2=1.468&f=u