Author: shadzik Date: Wed Jul 29 17:57:23 2009 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/kde4-kdelibs: kde4-kdelibs.spec (1.153 -> 1.154) ---- Diffs: ================================================================ Index: packages/kde4-kdelibs/kde4-kdelibs.spec diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.153 packages/kde4-kdelibs/kde4-kdelibs.spec:1.154 --- packages/kde4-kdelibs/kde4-kdelibs.spec:1.153 Sun Jul 12 05:23:46 2009 +++ packages/kde4-kdelibs/kde4-kdelibs.spec Wed Jul 29 19:57:17 2009 @@ -7,7 +7,8 @@ # %define _state stable %define orgname kdelibs -%define qtver 4.5.1 +%define qtver 4.5.2 +%define svn 979380 Summary: K Desktop Environment - libraries Summary(es.UTF-8): K Desktop Environment - bibliotecas @@ -17,17 +18,16 @@ Summary(ru.UTF-8): K Desktop Environment - Библиотеки Summary(uk.UTF-8): K Desktop Environment - Бібліотеки Name: kde4-kdelibs -Version: 4.2.4 -Release: 5 +Version: 4.3.0 +Release: 1 License: LGPL Group: X11/Libraries Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 -# Source0-md5: 9ed29086c33bc73256a7fa5268df560b -Patch100: %{name}-branch.diff +# Source0-md5: 20d1a98ac071859075bfef0aa411c768 +#Patch100: %{name}-branch.diff Patch0: %{orgname}4-findqt4.patch Patch1: %{name}-findboost.patch Patch2: %{name}-branding.patch -Patch3: %{name}-fixPopupForPlasmaboard.patch URL: http://www.kde.org/ BuildRequires: OpenEXR-devel >= 1.2.2 BuildRequires: Qt3Support-devel >= %{qtver} @@ -50,11 +50,11 @@ BuildRequires: bzip2-devel BuildRequires: cmake >= 2.6.3 BuildRequires: cups-devel -BuildRequires: docbook-dtd41-sgml -BuildRequires: docbook-dtd412-xml -BuildRequires: docbook-dtd42-xml -BuildRequires: docbook-style-xsl -BuildRequires: docbook-utils +%{?with_apidocs:BuildRequires: docbook-dtd41-sgml} +%{?with_apidocs:BuildRequires: docbook-dtd412-xml} +%{?with_apidocs:BuildRequires: docbook-dtd42-xml} +%{?with_apidocs:BuildRequires: docbook-style-xsl} +%{?with_apidocs:BuildRequires: docbook-utils} %{?with_apidocs:BuildRequires: doxygen} BuildRequires: enchant-devel BuildRequires: fam-devel @@ -88,25 +88,26 @@ BuildRequires: qt4-qmake >= %{qtver} BuildRequires: rpmbuild(macros) >= 1.293 BuildRequires: shared-mime-info >= 0.18 -BuildRequires: soprano-devel >= 2.1.64 -BuildRequires: strigi-devel >= 0.6.3 +BuildRequires: soprano-devel >= 2.3.0 +BuildRequires: strigi-devel >= 0.6.5 BuildRequires: sysstat BuildRequires: utempter-devel +BuildRequires: xz-devel BuildRequires: zlib-devel BuildConflicts: kdelibs BuildConflicts: kdelibs-devel Requires: %{name}-libs = %{version}-%{release} Requires: QtCore >= %{qtver} -Requires: docbook-dtd412-xml -Requires: docbook-dtd42-xml -Requires: docbook-style-xsl +%{?with_apidocs:Requires: docbook-dtd412-xml} +%{?with_apidocs:Requires: docbook-dtd42-xml} +%{?with_apidocs:Requires: docbook-style-xsl} Requires: hicolor-icon-theme -Requires: kde-common-dirs >= 0.3 +Requires: kde-common-dirs >= 0.5 Requires: setup >= 2.4.6-7 Requires: xdg-menus Requires: xorg-app-iceauth -Provides: %{name}-shared Suggests: kde4-icons +Provides: %{name}-shared Obsoletes: kde4-kdelibs-shared Obsoletes: kdelibs4 Conflicts: kdelibs @@ -131,8 +132,7 @@ %description -l pl.UTF-8 Ten pakiet zawiera biblioteki potrzebne do rozwijania i uruchamiania -aplikacji KDE, różną dokumentację oraz moduły z motywami wyglądu -KDE. +aplikacji KDE, różną dokumentację oraz moduły z motywami wyglądu KDE. Pakiet ten zawiera między innymi: - kdecore - podstawową bibliotekę KDE, @@ -236,11 +236,11 @@ %prep %setup -q -n %{orgname}-%{version} +##%setup -q -n %{orgname}-%{version} #%patch100 -p0 -%patch0 -p0 -%patch1 -p0 +#%patch0 -p0 +#%patch1 -p0 %patch2 -p0 -%patch3 -p1 %build install -d build @@ -276,8 +276,6 @@ $RPM_BUILD_ROOT%{_libdir}/kconf_update_bin \ $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden \ $RPM_BUILD_ROOT%{_datadir}/apps/khtml/kpartplugins \ - $RPM_BUILD_ROOT%{_datadir}/apps/profiles \ - $RPM_BUILD_ROOT%{_datadir}/apps/remotes \ $RPM_BUILD_ROOT%{_datadir}/apps/desktoptheme \ $RPM_BUILD_ROOT%{_datadir}/apps/desktoptheme/default \ $RPM_BUILD_ROOT%{_datadir}/config/magic \ @@ -316,13 +314,7 @@ %attr(755,root,root) %{_bindir}/checkXML %attr(755,root,root) %{_bindir}/kunittestmodrunner %attr(755,root,root) %{_bindir}/makekdewidgets -# nepomuk ??? %attr(755,root,root) %{_bindir}/nepomuk-rcgen -%dir %{_datadir}/apps/nepomuk -#%{_datadir}/apps/nepomuk/ontologies -%dir %{_datadir}/apps/nepomuk/pics -%{_datadir}/apps/nepomuk/pics/rating.png -##### nepomuk ??? %{_kdedocdir}/en/sonnet %{_mandir}/man1/kde4-config.1* %{_mandir}/man1/kdecmake.1* @@ -343,7 +335,7 @@ %{_datadir}/apps/kconf_update/*.upd.sh %{_datadir}/apps/kconf_update/move_kio_help_cache.sh %{_datadir}/apps/LICENSES -%{_datadir}/apps/kcertpart +#%{_datadir}/apps/kcertpart %{_datadir}/apps/khtml/css/presentational.css %{_datadir}/apps/khtml/domain_info %{_datadir}/apps/khtml/error.html @@ -351,7 +343,7 @@ %{_datadir}/apps/khtml/kpartplugins %{_datadir}/apps/kjava/kjava.policy %{_datadir}/apps/kjava/pluginsinfo -%{_datadir}/apps/ktexteditor_docwordcompletion +# %{_datadir}/apps/ktexteditor_docwordcompletion %{_datadir}/apps/ktexteditor_insertfile %{_datadir}/apps/ktexteditor_kdatatool %{_datadir}/apps/proxyscout @@ -362,8 +354,6 @@ %dir %{_datadir}/applnk %dir %{_datadir}/applnk/.hidden -%dir %{_datadir}/apps/profiles -%dir %{_datadir}/apps/remotes %dir %{_datadir}/apps/desktoptheme %dir %{_datadir}/apps/desktoptheme/default %dir %{_datadir}/services/kconfiguredialog @@ -397,6 +387,7 @@ %{_datadir}/apps/kjava/kjava.jar %{_datadir}/apps/ksgmltools2 %{_datadir}/apps/kssl +%{_datadir}/apps/nepomuk %dir %{_datadir}/config %dir %{_datadir}/config/ui %{_datadir}/config/ui/ui_standards.rc @@ -437,13 +428,12 @@ %attr(755,root,root) %{_libdir}/libkfile.so.* %attr(755,root,root) %{_libdir}/libkrosscore.so.* %attr(755,root,root) %{_libdir}/libkrossui.so.* -%attr(755,root,root) %{_libdir}/libnepomuk.so.*.*.* -%attr(755,root,root) %{_libdir}/libnepomuk.so.? %attr(755,root,root) %{_libdir}/libkdeinit4_kbuildsycoca4.so %attr(755,root,root) %{_libdir}/libkdeinit4_kded4.so %attr(755,root,root) %{_libdir}/libkdeinit4_kconf_update.so %attr(755,root,root) %{_libdir}/libkdeinit4_kio_http_cache_cleaner.so %attr(755,root,root) %{_libdir}/libkdeinit4_klauncher.so +%attr(755,root,root) %{_libdir}/libnepomuk.so.* %attr(755,root,root) %{_libdir}/kde4/*.so %dir %{_libdir}/kde4/plugins/designer @@ -485,8 +475,8 @@ %attr(755,root,root) %{_libdir}/libsolid.so %attr(755,root,root) %{_libdir}/libthreadweaver.so %attr(755,root,root) %{_libdir}/libkfile.so -%attr(755,root,root) %{_libdir}/libknewstuff2.so %attr(755,root,root) %{_libdir}/libnepomuk.so +%attr(755,root,root) %{_libdir}/libknewstuff2.so %attr(755,root,root) %{_libdir}/libkrosscore.so %attr(755,root,root) %{_libdir}/libkrossui.so %attr(755,root,root) %{_libdir}/libplasma.so @@ -515,6 +505,8 @@ %{_includedir}/KDE/K3DockWidgetAbstractHeaderDrag %{_includedir}/KDE/K3DockWidgetHeader %{_includedir}/KDE/K3DockWidgetHeaderDrag +%{_includedir}/KDE/KFileItemActions +%{_includedir}/KDE/KFileItemListProperties %{_includedir}/KDE/K3FileTreeView %{_includedir}/KDE/K3FileTreeViewItem %{_includedir}/KDE/K3Icon @@ -654,6 +646,7 @@ %{_includedir}/KDE/KDirModel %{_includedir}/KDE/KDirOperator %{_includedir}/KDE/KDirSelectDialog +%{_includedir}/KDE/KDirSortFilterProxyModel %{_includedir}/KDE/KDirWatch %{_includedir}/KDE/KDiskFreeSpace %{_includedir}/KDE/KDiskFreeSpaceInfo @@ -680,17 +673,19 @@ %{_includedir}/KDE/KFileMetaInfoGroup %{_includedir}/KDE/KFileMetaInfoItem %{_includedir}/KDE/KFilePlacesModel +%{_includedir}/KDE/KFilePlacesView +%{_includedir}/KDE/KFilePreviewGenerator %{_includedir}/KDE/KFileShare %{_includedir}/KDE/KFileSharePropsPlugin %{_includedir}/KDE/KFileTreeBranch %{_includedir}/KDE/KFileTreeView +%{_includedir}/KDE/KFileWidget %{_includedir}/KDE/KFilterBase %{_includedir}/KDE/KFilterDev %{_includedir}/KDE/KFilterProxySearchLine %{_includedir}/KDE/KFind %{_includedir}/KDE/KFindDialog %{_includedir}/KDE/KFloatValidator -%{_includedir}/KDE/KFolderType %{_includedir}/KDE/KFontAction %{_includedir}/KDE/KFontChooser %{_includedir}/KDE/KFontComboBox @@ -761,6 +756,7 @@ %{_includedir}/KDE/KMimeTypeResolver %{_includedir}/KDE/KMimeTypeTrader %{_includedir}/KDE/KMimeTypeValidator +%{_includedir}/KDE/KModifierKeyInfo %{_includedir}/KDE/KMozillaBookmarkImporterImpl %{_includedir}/KDE/KMultiTabBar %{_includedir}/KDE/KMultiTabBarButton @@ -927,6 +923,7 @@ %{_includedir}/KDE/KUserGroup %{_includedir}/KDE/KVBox %{_includedir}/KDE/KWallet +%{_includedir}/KDE/KWidgetItemDelegate %{_includedir}/KDE/KWindowInfo %{_includedir}/KDE/KWindowSystem %{_includedir}/KDE/KWordMacroExpander @@ -952,6 +949,7 @@ %{_includedir}/KDE/OrgKdeKLauncherInterface %{_includedir}/KDE/PtyProcess %{_includedir}/KDE/Solid +%{_includedir}/KDE/Sonnet %{_includedir}/KDE/SshProcess %{_includedir}/KDE/StubProcess %{_includedir}/KDE/SuProcess @@ -961,6 +959,8 @@ %{_includedir}/KDE/khtml %{_includedir}/KDE/kndbgstream %{_includedir}/KDE/Plasma +%dir %{_includedir}/nepomuk +%{_includedir}/nepomuk/* %dir %{_includedir}/plasma %{_includedir}/plasma/* %dir %{_includedir}/dnssd @@ -983,8 +983,6 @@ %{_includedir}/kross %dir %{_includedir}/ktexteditor %{_includedir}/ktexteditor/* -%dir %{_includedir}/nepomuk -%{_includedir}/nepomuk/* %{_includedir}/*.h %dir %{_includedir}/solid %{_includedir}/solid/* @@ -1010,28 +1008,70 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.153 2009/07/12 03:23:46 arekm -- release 5 - -Revision 1.152 2009/07/02 20:47:39 hawk -- release 4 +Revision 1.154 2009/07/29 17:57:17 shadzik +- merged from DEVEL -Revision 1.151 2009/07/02 14:18:03 baggins -- back to heimdal kerberos +Revision 1.146.2.19 2009/07/29 17:55:14 shadzik +- 4.3.0 -Revision 1.150 2009/06/12 08:51:07 shadzik -- add -fixPopupForPlasmaboard.patch -- rel 3 - -Revision 1.149 2009/06/01 05:56:54 shadzik +Revision 1.146.2.18 2009/07/22 17:13:09 shadzik - new tarball - rel 2 -Revision 1.148 2009/05/28 21:52:18 shadzik -- 4.2.4 try #1 +Revision 1.146.2.17 2009/07/21 23:48:49 shadzik +- updated BRs and Rs + +Revision 1.146.2.16 2009/07/21 22:50:27 shadzik +- 4.3rc3 + +Revision 1.146.2.15 2009/07/13 16:47:15 shadzik +- krb5-devel -> heimdal-devel + +Revision 1.146.2.14 2009/07/10 12:41:55 cactus +- proper bcond on R: and BR: for bcond apidocs + +Revision 1.146.2.13 2009/07/09 19:05:15 paszczus +- updated to 4.2.96 + +Revision 1.146.2.12 2009/07/04 14:38:44 shadzik +- profiles and remotes already in kde-common-dirs + +Revision 1.146.2.11 2009/06/29 17:26:22 shadzik +- 4.3 RC1 + +Revision 1.146.2.10 2009/06/11 12:47:28 paszczus +- updated to 4.2.91 + +Revision 1.146.2.9 2009/06/08 10:38:48 paszczus +- cleanup + +Revision 1.146.2.8 2009/06/08 09:35:37 paszczus +- updated to 4.2.90 + +Revision 1.146.2.7 2009/05/30 16:19:34 cactus +- add nepomuk files + +Revision 1.146.2.6 2009/05/30 14:15:36 paszczus +- updated to 4.2.88 +- kdelibs-experimental moved to kde4-kdelibs-experimental.spec + +Revision 1.146.2.5 2009/05/29 08:11:16 paszczus +- moved libknotificationitem-1.so from devel to libs + +Revision 1.146.2.4 2009/05/26 11:15:58 paszczus +- added kdelibs-experimental to get libknotificationitem-1 + +Revision 1.146.2.3 2009/05/26 09:15:02 paszczus +- updated to 4.2.87 +- updated soprano BR: 2.1.68 +- added BR: xz-devel +- package Nepomuk files (!) + +Revision 1.146.2.2 2009/05/25 10:22:40 paszczus +- Patch100 commented (no reason to put it on DEVEL for now) -Revision 1.147 2009/05/28 19:32:32 arekm -- rel 3; branch diff is back +Revision 1.146.2.1 2009/05/11 17:30:41 shadzik +- 4.3 beta1 Revision 1.146 2009/05/08 14:31:01 shadzik - updated cmake br ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.153&r2=1.154&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
