Author: shadzik Date: Wed Feb 17 23:32:38 2010 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/kde4-kdebase: kde4-kdebase.spec (1.117 -> 1.118) ---- Diffs: ================================================================ Index: packages/kde4-kdebase/kde4-kdebase.spec diff -u packages/kde4-kdebase/kde4-kdebase.spec:1.117 packages/kde4-kdebase/kde4-kdebase.spec:1.118 --- packages/kde4-kdebase/kde4-kdebase.spec:1.117 Mon Feb 1 08:28:25 2010 +++ packages/kde4-kdebase/kde4-kdebase.spec Thu Feb 18 00:32:33 2010 @@ -4,13 +4,10 @@ # - more file moves between packages; what's with dozen of messy -core/-common/-common* packages? # - Req, Obsolets and Conflicts for every package # - new descriptions -# - k3b-1.69.0-0.alpha4.1.i686: required "/usr/share/apps/konqsidebartng/virtual_folders/services" is provided by following packages: -# a) kde4-kdebase-workspace-4.3.4-2.i686 -# b) kde4-konqueror-4.3.4-1.i686 # %define _state stable %define orgname kdebase -%define qtver 4.5.3 +%define qtver 4.6.1 Summary: K Desktop Environment - core files Summary(es.UTF-8): K Desktop Environment - archivos básicos @@ -22,27 +19,27 @@ Summary(uk.UTF-8): K Desktop Environment - базові файли Summary(zh_CN.UTF-8): KDE核心 Name: kde4-kdebase -Version: 4.3.5 -Release: 1 +Version: 4.4.0 +Release: 4 License: GPL Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 -# Source0-md5: 8780164dc328992cfbd9a6d5c9e8a8f5 +# Source0-md5: ddfc358aebe5dc8f5de6f5d1ff7cb018 Patch100: %{name}-branch.diff Patch0: %{name}-wordchars.patch URL: http://www.kde.org/ BuildRequires: OpenEXR-devel >= 1.2.2 BuildRequires: OpenGL-devel -BuildRequires: Qt3Support-devel +BuildRequires: Qt3Support-devel >= %{qtver} BuildRequires: QtCore-devel >= %{qtver} BuildRequires: QtNetwork-devel >= %{qtver} -BuildRequires: QtSvg-devel -BuildRequires: QtTest-devel +BuildRequires: QtSvg-devel >= %{qtver} +BuildRequires: QtTest-devel >= %{qtver} BuildRequires: audiofile-devel BuildRequires: automoc4 >= 0.9.88 BuildRequires: bzip2-devel BuildRequires: cdparanoia-III-devel -BuildRequires: cmake >= 2.6.3 +BuildRequires: cmake >= 2.8.0 BuildRequires: cups-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel @@ -73,11 +70,12 @@ BuildRequires: pciutils-devel BuildRequires: pkgconfig BuildRequires: qimageblitz-devel -BuildRequires: qt4-build -BuildRequires: qt4-qmake +BuildRequires: qt4-build >= %{qtver} +BuildRequires: qt4-qmake >= %{qtver} BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: samba-devel +BuildRequires: shared-desktop-ontologies-devel >= 0.2 BuildRequires: soprano-devel BuildRequires: strigi-devel BuildRequires: xorg-app-bdftopcf @@ -117,8 +115,7 @@ - many more. %description -l ja.UTF-8 -KDEデスクトップ環境用の基本アプリケーション。 以下のようなパッケージが入っています。 - +KDEデスクトップ環境用の基本アプリケーション〄1�7以下のようなパッケージが入っています〄1�7 %description -l pl.UTF-8 Ten pakiet zawiera podstawowe aplikacje KDE: - Centrum sterowania z modułami @@ -346,7 +343,7 @@ %prep %setup -q -n %{orgname}-%{version} -#%patch100 -p0 +%patch100 -p0 %patch0 -p1 %{__sed} -i -e 's/Categories=.*/Categories=Audio;Mixer;/' \ @@ -417,6 +414,8 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/kbookmarkmerger +%attr(755,root,root) %{_bindir}/servicemenudeinstallation +%attr(755,root,root) %{_bindir}/servicemenuinstallation %attr(755,root,root) %{_libdir}/kde4/libkcminit_nsplugins.so %attr(755,root,root) %{_libdir}/kde4/khtmlkttsdplugin.so %attr(755,root,root) %{_libdir}/kde4/plasma_applet_folderview.so @@ -442,6 +441,12 @@ %{_iconsdir}/*/*/apps/*.svgz %{_mandir}/man1/kbookmarkmerger.1.* +# view svn plugin - where to put?? +%attr(755,root,root) %{_libdir}/kde4/fileviewsvnplugin.so +%{_datadir}/kde4/services/fileviewsvnplugin.desktop +%{_datadir}/config/servicemenu.knsrc +%{_datadir}/kde4/servicetypes/fileviewversioncontrolplugin.desktop + %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libdolphinprivate.so @@ -554,10 +559,12 @@ %attr(755,root,root) %{_libdir}/kde4/kcm_dolphinviewmodes.so %attr(755,root,root) %{_libdir}/kde4/dolphinpart.so %dir %{_datadir}/apps/dolphin +%{_datadir}/apps/dolphin/dolphinsearchcommands.desktop %{_datadir}/apps/dolphin/dolphinui.rc %dir %{_datadir}/apps/dolphinpart %{_datadir}/apps/dolphinpart/dolphinpart.rc %{_datadir}/config.kcfg/dolphin_columnmodesettings.kcfg +%{_datadir}/config.kcfg/dolphin_versioncontrolsettings.kcfg %{_datadir}/config.kcfg/dolphin_detailsmodesettings.kcfg %{_datadir}/config.kcfg/dolphin_directoryviewpropertysettings.kcfg %{_datadir}/config.kcfg/dolphin_generalsettings.kcfg @@ -593,8 +600,6 @@ %attr(755,root,root) %{_libdir}/kde4/kded_konqy_preloader.so %attr(755,root,root) %{_libdir}/kde4/konq_aboutpage.so %attr(755,root,root) %{_libdir}/kde4/libnsplugin.so -%{_datadir}/apps/kconf_update/konqsidebartng.upd -%{_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh %{_datadir}/apps/kbookmark %{_datadir}/apps/kcmcss %{_datadir}/apps/keditbookmarks @@ -607,7 +612,7 @@ %dir %{_datadir}/apps/plugin %{_datadir}/apps/plugin/nspluginpart.rc %{_datadir}/autostart/konqy_preload.desktop -%{_datadir}/config/konqsidebartng.rc +%{_datadir}/config/konqsidebartngrc %{_datadir}/config.kcfg/konqueror.kcfg %{_datadir}/kde4/servicetypes/findpart.desktop %{_datadir}/kde4/servicetypes/konqaboutpage.desktop @@ -636,7 +641,7 @@ %{_datadir}/kde4/services/konq_aboutpage.desktop %{_datadir}/kde4/services/konq_sidebartng.desktop %{_datadir}/kde4/services/konqueror.desktop -%{_datadir}/kde4/services/lanbrowser.desktop +#%{_datadir}/kde4/services/lanbrowser.desktop %{_datadir}/kde4/services/netpref.desktop %{_datadir}/kde4/services/proxy.desktop %{_datadir}/kde4/services/smb.desktop @@ -657,8 +662,8 @@ %attr(755,root,root) %{_libdir}/kde4/konq_sidebar.so %attr(755,root,root) %{_libdir}/kde4/konq_sidebartree_bookmarks.so %attr(755,root,root) %{_libdir}/kde4/konq_sidebartree_dirtree.so -%attr(755,root,root) %{_libdir}/kde4/konq_sidebartree_history.so %attr(755,root,root) %{_libdir}/kde4/konq_sound.so +%attr(755,root,root) %{_libdir}/kde4/konqsidebar_history.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_shellcmdplugin.so @@ -677,46 +682,88 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.117 2010/02/01 07:28:25 paszczus +Revision 1.118 2010/02/17 23:32:33 shadzik +- merged from DEVEL + +Revision 1.104.2.26 2010/02/17 20:30:00 arekm +- rel 4; branch diff updated + +Revision 1.104.2.25 2010/02/12 07:41:10 arekm +- rel 3; branch diff updated + +Revision 1.104.2.24 2010/02/05 18:06:02 arekm +- rel 2; new tarball + +Revision 1.104.2.23 2010/02/04 20:30:28 arekm +- up to 4.4.0 + +Revision 1.104.2.22 2010/02/02 20:54:20 shadzik +- bump up qtver; it's not necessary but we make sure we link with the latest qtver + +Revision 1.104.2.21 2010/02/02 15:59:06 shadzik +- minor clean up (removing old svn snap stuff) + +Revision 1.104.2.20 2010/02/02 15:44:09 shadzik +- version qt4 BRs +- force cmake 2.8.0 + +Revision 1.104.2.19 2010/02/01 07:27:56 paszczus - added S: eject do -dolphin subpackage -Revision 1.116 2010/01/28 21:47:00 shadzik -- 4.3.5 +Revision 1.104.2.18 2010/02/01 00:07:28 shadzik +- 4.4 RC3 +- surprisingly no new files :) + +Revision 1.104.2.17 2010/01/20 08:38:23 arekm +- up to 4.3.95 + +Revision 1.104.2.16 2010/01/08 11:36:38 arekm +- up to 4.3.90 -Revision 1.115 2010/01/14 17:19:42 hawk -- release 2 +Revision 1.104.2.15 2009/12/22 12:18:39 shadzik +- %files -Revision 1.114 2009/12/22 09:08:54 uzsolt -- new TODO +Revision 1.104.2.14 2009/12/20 15:24:32 shadzik +- 4.4 Beta2 -Revision 1.113 2009/12/03 23:05:24 sparky +Revision 1.104.2.13 2009/12/04 14:32:39 shadzik +- BR +- rel 2 + +Revision 1.104.2.12 2009/12/03 23:07:04 sparky - BR: Qt3Support-devel, QtSvg-devel, QtTest-devel, qt4-build, qt4-qmake, soprano-devel, strigi-devel -- -devel group corrected +- correct devel group + +Revision 1.104.2.11 2009/12/03 16:04:29 shadzik +- 4.4 beta1 + +Revision 1.104.2.10 2009/11/17 23:46:14 shadzik +- 4.3.75 -Revision 1.112 2009/11/28 17:54:38 shadzik -- 4.3.4 +Revision 1.104.2.9 2009/11/01 18:47:57 shadzik +- reverted undocumented stupidness of rev 1.104.2.5 -Revision 1.111 2009/11/25 09:55:49 arekm -- rel 2; branch diff updated +Revision 1.104.2.8 2009/10/29 00:24:11 shadzik +- 4.3.73 -Revision 1.110 2009/10/31 13:35:13 shadzik -- 4.3.3 +Revision 1.104.2.7 2009/10/18 15:58:33 paszczus +- updated to 4.3.72 -Revision 1.109 2009/10/08 16:13:02 arekm -- rel 2; branch diff fixes +Revision 1.104.2.6 2009/10/02 12:50:56 cactus +- up to 4.3.69 -Revision 1.108 2009/10/03 11:58:31 shadzik -- updated qt BR +Revision 1.104.2.5 2009/09/23 00:05:48 cactus +- merged some changes from HEAD -Revision 1.107 2009/10/02 18:02:38 shadzik -- 4.3.2 try #1 +Revision 1.104.2.3 2009/09/11 22:22:13 cactus +- up to 4.3.67 -Revision 1.106 2009/08/29 17:03:49 shadzik -- BR: openldap-devel +Revision 1.104.2.2 2009/08/25 09:40:12 cactus +- up to 4.3.65 -Revision 1.105 2009/08/28 14:27:52 shadzik -- 4.3.1 +Revision 1.104.2.1 2009/08/20 09:02:28 cactus +- up to 4.3.64 Revision 1.104 2009/08/19 20:01:31 arekm - rel 3; branch diff is back ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase.spec?r1=1.117&r2=1.118&f=u
_______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
