packages: kdebase/kdebase.spec - openssl 1.x fix - arts files fix - rel 14

[glen]

Author: glen                         Date: Mon May  3 11:33:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- openssl 1.x fix
- arts files fix
- rel 14

---- Files affected:
packages/kdebase:
   kdebase.spec (1.631 -> 1.632) 

---- Diffs:

================================================================
Index: packages/kdebase/kdebase.spec
diff -u packages/kdebase/kdebase.spec:1.631 packages/kdebase/kdebase.spec:1.632
--- packages/kdebase/kdebase.spec:1.631	Mon May  3 09:45:24 2010
+++ packages/kdebase/kdebase.spec	Mon May  3 13:33:13 2010
@@ -16,10 +16,9 @@
 %bcond_with	kerberos5		# kerberos 5 support
 %bcond_without	hidden_visibility	# no gcc hidden visibility
 %bcond_with	groupwindows		# raise all windows belonging to program together
-#
+
 %define		_state		stable
 %define		_minlibsevr	9:%{version}
-
 Summary:	K Desktop Environment - core files
 Summary(es.UTF-8):	K Desktop Environment - archivos básicos
 Summary(ja.UTF-8):	KDEデスクトップ環境 - 基本ファイル
@@ -31,7 +30,7 @@
 Summary(zh_CN.UTF-8):	KDE核心
 Name:		kdebase
 Version:	3.5.10
-Release:	13
+Release:	14
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -78,6 +77,7 @@
 Patch28:	%{name}-no_mkfontdir.patch
 Patch29:	kde-am.patch
 Patch30:	ac264.patch
+Patch31:	openssl.patch
 BuildRequires:	OpenEXR-devel >= 1.4.0.a
 BuildRequires:	OpenGL-devel
 BuildRequires:	audiofile-devel
@@ -147,9 +147,13 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_xdgdatadir	%{_datadir}/desktop-directories
+
 # openexr detection fails
 %undefine	configure_cache
 
+# build broken with spaces in CC
+%undefine	with_ccache
+
 %description
 This package contains KDE base system which includes:
 - KDE Control Centre with modules
@@ -1105,6 +1109,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 cd kcontrol/ebrowsing/plugins/ikws/searchproviders
 for i in  google*.desktop
@@ -1808,7 +1813,7 @@
 %attr(755,root,root) %{_libdir}/kde3/kcm_keys.so
 %attr(755,root,root) %{_libdir}/kde3/kcm_khotkeys.so
 %attr(755,root,root) %{_libdir}/kde3/kcm_khotkeys_init.so
-%attr(755,root,root) %{_libdir}/kde3/khotkeys_arts.so
+%{?with_arts:%attr(755,root,root) %{_libdir}/kde3/khotkeys_arts.so}
 %attr(755,root,root) %{_libdir}/kde3/kcm_knotify.so
 %attr(755,root,root) %{_libdir}/kde3/kcm_ksplashthemes.so
 %attr(755,root,root) %{_libdir}/kde3/kcm_kwindecoration.so
@@ -2481,7 +2486,7 @@
 %attr(755,root,root) %{_libdir}/kde3/konq_sidebartree_bookmarks.so
 %attr(755,root,root) %{_libdir}/kde3/konq_sidebartree_dirtree.so
 %attr(755,root,root) %{_libdir}/kde3/konq_sidebartree_history.so
-%attr(755,root,root) %{_libdir}/kde3/konq_sound.so
+%{?with_arts:%attr(755,root,root) %{_libdir}/kde3/konq_sound.so}
 %attr(755,root,root) %{_libdir}/kde3/konqueror.so
 %attr(755,root,root) %{_libdir}/kde3/libkfindpart.so
 %attr(755,root,root) %{_libdir}/kde3/libkshorturifilter.so
@@ -2651,6 +2656,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.632  2010/05/03 11:33:13  glen
+- openssl 1.x fix
+- arts files fix
+- rel 14
+
 Revision 1.631  2010/05/03 07:45:24  glen
 - arts bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdebase/kdebase.spec?r1=1.631&r2=1.632&f=u