SPECS (AC-branch): kdebase.spec - 3.5.2

[glen]

Author: glen                         Date: Sun Mar 26 22:39:46 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 3.5.2

---- Files affected:
SPECS:
   kdebase.spec (1.491 -> 1.491.2.1) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.491 SPECS/kdebase.spec:1.491.2.1
--- SPECS/kdebase.spec:1.491	Sat Feb 11 15:25:32 2006
+++ SPECS/kdebase.spec	Mon Mar 27 00:39:41 2006
@@ -10,14 +10,12 @@
 %bcond_without	apidocs		# Do not prepare API documentation
 %bcond_without	ldap		# build or not ldap ioslave
 %bcond_with	kerberos5	# kerberos 5 support
-%bcond_with	hidden_visibility	# pass '--fvisibility=hidden'
-					# & '--fvisibility-inlines-hidden'
-					# to g++
+%bcond_with	hidden_visibility	# pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
 #
 %define		_state		stable
-%define		_kdever		3.5.1
-%define		_ver		3.5.1
-%define		_minlibsevr	9:3.5.1
+%define		_kdever		3.5.2
+%define		_ver		3.5.2
+%define		_minlibsevr	9:3.5.2
 
 Summary:	K Desktop Environment - core files
 Summary(es):	K Desktop Environment - archivos básicos
@@ -30,12 +28,12 @@
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
 Version:	%{_ver}
-Release:	3
+Release:	1
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{_ver}.tar.bz2
-# Source0-md5:	484c7b3895ce4f95173f4789571eb1cc
+# Source0-md5:	c5685e1be34e033286aa1f37002a0552
 Source1:	%{name}-kdesktop.pam
 Source2:	%{name}-kdm.pam
 Source3:	%{name}-kdm-np.pam
@@ -44,7 +42,7 @@
 Source6:	%{name}-kdm_pldlogo.png
 Source7:	%{name}-kdm_pldwallpaper.png
 Source8:	%{name}-searchproviders.tar.bz2
-# Source8-md5:	5f5c25cd843a3956354eef7dcfa0c883
+# Source8-md5:	582b29204e85c01a91799ed72f845312
 Source10:	%{name}-servicemenus.tar.bz2
 # Source10-md5:	b8ce7213a7f54c97874f1ea9cb7973b3
 Source13:	ftp://ftp.pld-linux.org/software/kde/%{name}-konqsidebartng-PLD-entries-0.1.tar.bz2
@@ -71,6 +69,7 @@
 Patch19:	%{name}-konsole-default-keytab.patch
 Patch20:	%{name}-seesar.patch
 Patch21:	%{name}-konsole-wordseps.patch
+Patch22:	%{name}-tango.patch
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	OpenGL-devel
 BuildRequires:	audiofile-devel
@@ -96,7 +95,7 @@
 BuildRequires:	lame-libs-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 1.0.8
-BuildRequires:	libraw1394-devel
+BuildRequires:	libraw1394-devel >= 1.2.0
 BuildRequires:	libsmbclient-devel >= 3.0.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
@@ -116,7 +115,7 @@
 %{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 %{?with_apidocs:BuildRequires:	qt-doc}
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.129
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 #BuildRequires:	unsermake >= 040511
 BuildRequires:	xcursor-devel >= 1.1.0
@@ -1031,7 +1030,7 @@
 
 %prep
 %setup -q
-%patch100 -p0
+#%patch100 -p0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -1054,6 +1053,7 @@
 #%patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p0
 
 cd kcontrol/ebrowsing/plugins/ikws/searchproviders
 for i in  google*.desktop
@@ -1385,7 +1385,7 @@
  * NOTE:                                           *
  * To make sure that new version of KDM is running *
  * You should restart KDM with:                    *
- * "/etc/rc.d/init.d/kdm restart".                 *
+ * "/sbin/service kdm restart".                    *
  *                                                 *
  * WARNING:                                        *
  * Restarting KDM will terminate any X session     *
@@ -1396,16 +1396,14 @@
 EOF
 else
 	%banner kdm -e <<EOF
-Run "/etc/rc.d/init.d/kdm start" to start kdm.
+Run "/sbin/service kdm start" to start kdm.
 
 EOF
 fi
 
 %preun -n kdm
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/kdm ]; then
-		/etc/rc.d/init.d/kdm stop >&2
-	fi
+	%service kdm stop
 	/sbin/chkconfig --del kdm
 fi
 
@@ -1765,6 +1763,7 @@
 %attr(755,root,root) %{_libdir}/kconf_update_bin/khotkeys_update
 %attr(755,root,root) %{_libdir}/kconf_update_bin/kicker-3.4-reverseLayout
 %attr(755,root,root) %{_libdir}/kconf_update_bin/kwin_update_window_settings
+%attr(755,root,root) %{_libdir}/kconf_update_bin/kwin_update_default_rules
 # New
 %attr(755,root,root) %{_bindir}/kbookmarkmerger
 %attr(755,root,root) %{_bindir}/kcheckrunning
@@ -2861,6 +2860,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.491.2.1  2006/03/26 22:39:41  glen
+- 3.5.2
+
 Revision 1.491  2006/02/11 14:25:32  arekm
 - branch patch updated
 
================================================================

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