packages: kde4-kdebase/kde4-kdebase.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Wed Jul 29 21:00:31 CEST 2009 

Author: shadzik                      Date: Wed Jul 29 19:00:31 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdebase:
   kde4-kdebase.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: packages/kde4-kdebase/kde4-kdebase.spec
diff -u packages/kde4-kdebase/kde4-kdebase.spec:1.100 packages/kde4-kdebase/kde4-kdebase.spec:1.101
--- packages/kde4-kdebase/kde4-kdebase.spec:1.100	Fri May 29 00:21:27 2009
+++ packages/kde4-kdebase/kde4-kdebase.spec	Wed Jul 29 21:00:26 2009
@@ -7,7 +7,7 @@
 #
 %define		_state		stable
 %define		orgname		kdebase
-%define		qtver		4.5.1
+%define		qtver		4.5.2
 
 Summary:	K Desktop Environment - core files
 Summary(es.UTF-8):	K Desktop Environment - archivos básicos
@@ -19,13 +19,13 @@
 Summary(uk.UTF-8):	K Desktop Environment - базові файли
 Summary(zh_CN.UTF-8):	KDE核心
 Name:		kde4-kdebase
-Version:	4.2.4
+Version:	4.3.0
 Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	848f76d9151b5b59be28af188a93a99a
-Patch100:	%{name}-branch.diff
+# Source0-md5:	5d8f4dc4028850b051d89d6ae5c7dc57
+#Patch100:	%{name}-branch.diff
 Patch0:		%{name}-wordchars.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.2.2
@@ -356,6 +356,7 @@
 cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DLIB_INSTALL_DIR=%{_libdir} \
 	-DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
@@ -426,9 +427,7 @@
 %{_desktopdir}/kde4/kfmclient_war.desktop
 %exclude %{_iconsdir}/*/scalable
 %{_iconsdir}/*/*/apps/*.png
-%{_iconsdir}/*/*/actions/*.png
 %{_iconsdir}/*/*/apps/*.svgz
-#%{_iconsdir}/*/*/actions/*.svgz
 %{_mandir}/man1/kbookmarkmerger.1.*
 
 %files devel
@@ -505,6 +504,7 @@
 %attr(755,root,root) %{_bindir}/konsoleprofile
 %attr(755,root,root) %{_libdir}/libkdeinit4_konsole.so
 %attr(755,root,root) %{_libdir}/kde4/libkonsolepart.so
+%attr(755,root,root) %{_libdir}/libkonsoleprivate.so
 %{_datadir}/kde4/services/ServiceMenus/konsolehere.desktop
 %{_datadir}/kde4/services/konsolepart.desktop
 %{_datadir}/apps/konsole
@@ -536,8 +536,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/dolphin
 %attr(755,root,root) %{_libdir}/libdolphinprivate.so.*
+%attr(755,root,root) %{_libdir}/kde4/kcm_dolphingeneral.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_dolphinnavigation.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_dolphinservices.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_dolphinviewmodes.so
 %attr(755,root,root) %{_libdir}/kde4/dolphinpart.so
-%attr(755,root,root) %{_libdir}/kde4/kcm_dolphin.so
 %dir %{_datadir}/apps/dolphin
 %{_datadir}/apps/dolphin/dolphinui.rc
 %dir %{_datadir}/apps/dolphinpart
@@ -549,25 +552,24 @@
 %{_datadir}/config.kcfg/dolphin_iconsmodesettings.kcfg
 %{_datadir}/config.kcfg/keditbookmarks.kcfg
 %{_datadir}/kde4/services/dolphinpart.desktop
+%{_datadir}/kde4/services/kcmdolphingeneral.desktop
+%{_datadir}/kde4/services/kcmdolphinnavigation.desktop
+%{_datadir}/kde4/services/kcmdolphinservices.desktop
+%{_datadir}/kde4/services/kcmdolphinviewmodes.desktop
 %{_desktopdir}/kde4/dolphin.desktop
-%{_datadir}/kde4/services/kcmdolphin.desktop
 %{_kdedocdir}/en/dolphin
 %dir %{_datadir}/apps/dolphinpart/kpartplugins
-%{_datadir}/apps/dolphinpart/kpartplugins/kremoteencodingplugin.desktop
-%{_datadir}/apps/dolphinpart/kpartplugins/kremoteencodingplugin.rc
 %{_datadir}/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop
 %{_datadir}/apps/dolphinpart/kpartplugins/kshellcmdplugin.rc
 
 %files -n kde4-konqueror
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/keditbookmarks
-%attr(755,root,root) %{_bindir}/keditfiletype
 %attr(755,root,root) %{_bindir}/kfmclient
 %attr(755,root,root) %{_bindir}/konqueror
 %attr(755,root,root) %{_bindir}/nspluginscan
 %attr(755,root,root) %{_bindir}/nspluginviewer
 %attr(755,root,root) %{_libdir}/libkdeinit4_konqueror.so
-%attr(755,root,root) %{_libdir}/kde4/kcm_filetypes.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_history.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_kio.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_konq.so
@@ -598,6 +600,7 @@
 %{_datadir}/kde4/servicetypes/findpart.desktop
 %{_datadir}/kde4/servicetypes/konqaboutpage.desktop
 %{_datadir}/kde4/servicetypes/konqpopupmenuplugin.desktop
+%{_datadir}/kde4/servicetypes/konqdndpopupmenuplugin.desktop
 %{_datadir}/kde4/servicetypes/terminalemulator.desktop
 %{_datadir}/kde4/servicetypes/uasprovider.desktop
 %{_datadir}/kde4/services/useragentstrings
@@ -607,7 +610,6 @@
 %{_datadir}/kde4/services/desktoppath.desktop
 %{_datadir}/kde4/services/ebrowsing.desktop
 %{_datadir}/kde4/services/filebehavior.desktop
-%{_datadir}/kde4/services/filetypes.desktop
 %{_datadir}/kde4/services/kcmhistory.desktop
 %{_datadir}/kde4/services/kcmkonqyperformance.desktop
 %{_datadir}/kde4/services/kcmperformance.desktop
@@ -647,7 +649,6 @@
 %attr(755,root,root) %{_libdir}/kde4/konq_sound.so
 %attr(755,root,root) %{_libdir}/kde4/konqsidebar_tree.so
 %attr(755,root,root) %{_libdir}/kde4/konqsidebar_web.so
-%attr(755,root,root) %{_libdir}/kde4/konq_remoteencoding.so
 %attr(755,root,root) %{_libdir}/kde4/konq_shellcmdplugin.so
 
 %files -n kde4-konqueror-libs
@@ -664,11 +665,32 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.100  2009/05/28 22:21:27  shadzik
-- 4.2.4 try #1
+Revision 1.101  2009/07/29 19:00:26  shadzik
+- merged from DEVEL
 
-Revision 1.99  2009/05/28 19:35:53  arekm
-- rel 3; branch diff is back
+Revision 1.98.2.8  2009/07/29 19:00:18  shadzik
+- 4.3.0
+
+Revision 1.98.2.7  2009/07/22 09:26:54  shadzik
+- 4.3.rc3
+
+Revision 1.98.2.6  2009/07/09 19:04:23  paszczus
+- updated to 4.2.96
+
+Revision 1.98.2.5  2009/07/04 15:32:54  shadzik
+- fix --target build
+
+Revision 1.98.2.4  2009/06/29 19:47:22  shadzik
+- 4.3 RC1
+
+Revision 1.98.2.3  2009/06/11 13:22:33  paszczus
+- updated to 4.2.91
+
+Revision 1.98.2.2  2009/05/30 14:47:07  paszczus
+- updated to 4.2.88
+
+Revision 1.98.2.1  2009/05/26 19:42:27  shadzik
+- 4.2.87
 
 Revision 1.98  2009/05/08 14:57:07  shadzik
 - rel 2
================================================================

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

More information about the pld-cvs-commit mailing list