Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at 2014-07-16 16:18:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4 (Old) and /work/SRC/openSUSE:Factory/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4/kdepim4.changes 2014-06-19 13:15:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim4.changes 2014-07-16 16:19:39.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jul 10 22:17:15 UTC 2014 - cgiboude...@gmx.com + +- Update to 4.13.80 + * KDE 4.14 Beta 1 release + * See http://www.kde.org/announcements/announce-4.14-beta1.php +- Add reenable-some-docs.diff - Build additional docs + +------------------------------------------------------------------- Old: ---- kdepim-4.13.2.tar.xz New: ---- kdepim-4.13.80.tar.xz reenable-some-docs.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.PVMy64/_old 2014-07-16 16:19:40.000000000 +0200 +++ /var/tmp/diff_new_pack.PVMy64/_new 2014-07-16 16:19:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepim4 -Version: 4.13.2 +Version: 4.13.80 Release: 0 Summary: Base package of kdepim License: GPL-2.0+ and LGPL-2.1+ @@ -27,6 +27,8 @@ Patch1: akregator-useragent.diff Patch2: desktop-files.diff Patch3: knode-kontact-default.diff +# PATCH-FIX-UPSTREAM reenable-some-docs.diff -- Reenable some subdirs from the doc directory +Patch4: reenable-some-docs.diff BuildRequires: baloo-devel BuildRequires: cyrus-sasl-devel BuildRequires: fdupes @@ -69,6 +71,7 @@ %patch1 %patch2 %patch3 +%patch4 -p1 %build %ifarch ppc64 @@ -222,16 +225,17 @@ %files -n akonadi -f filelists/akonadi_next.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README -%dir %{_datadir}/akonadi -%dir %{_datadir}/akonadi/agents +%dir %{_kde4_datadir}/akonadi +%dir %{_kde4_datadir}/akonadi/agents %dir %{_kde4_libdir}/akonadi %dir %{_kde4_libdir}/akonadi/contact %dir %{_kde4_libdir}/akonadi/contact/editorpageplugins -%{_datadir}/akonadi/agents/mailfilteragent.desktop -%{_datadir}/akonadi/agents/notesagent.desktop -%{_datadir}/akonadi/agents/archivemailagent.desktop -%{_datadir}/akonadi/agents/sendlateragent.desktop -%{_datadir}/akonadi/agents/folderarchiveagent.desktop +%{_kde4_datadir}/akonadi/agents/followupreminder.desktop +%{_kde4_datadir}/akonadi/agents/mailfilteragent.desktop +%{_kde4_datadir}/akonadi/agents/notesagent.desktop +%{_kde4_datadir}/akonadi/agents/archivemailagent.desktop +%{_kde4_datadir}/akonadi/agents/sendlateragent.desktop +%{_kde4_datadir}/akonadi/agents/folderarchiveagent.desktop %{_kde4_libdir}/akonadi/contact/editorpageplugins/cryptopageplugin.so %package -n akregator @@ -321,11 +325,11 @@ %files -n kmail -f filelists/kmail %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README -%config %{_kde4_configdir}/kmail.antispamrc -%config %{_kde4_configdir}/kmail.antivirusrc +%{_kde4_appsdir}/kmail2/pics/* +%{_kde4_configdir}/kmail.antispamrc +%{_kde4_configdir}/kmail.antivirusrc %{_kde4_configdir}/ksieve_script.knsrc %{_kde4_configdir}/messageviewer_header_themes.knsrc -%{_kde4_appsdir}/kmail2/pics/* %package -n knode Summary: News Reader @@ -444,10 +448,10 @@ %files -n korganizer -f filelists/korganizer.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README -%config %{_kde4_configdir}/korganizer.knsrc +%{_kde4_configdir}/korganizer.knsrc +%{_kde4_datadir}/autostart/korgac.desktop %{_kde4_servicetypesdir}/calendardecoration.desktop %{_kde4_servicetypesdir}/calendarplugin.desktop -%{_datadir}/autostart/korgac.desktop %package -n ktimetracker Summary: Personal Time Tracker @@ -540,7 +544,6 @@ %files -f filelists/exclude.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README -%config %{_kde4_configdir}/libkleopatrarc %doc %lang(en) %{_kde4_htmldir}/en/kontact-admin %doc %lang(en) %{_kde4_htmldir}/en/kabcclient %doc %lang(en) %{_kde4_htmldir}/en/konsolekalendar @@ -554,19 +557,20 @@ %doc %lang(en) %{_kde4_htmldir}/en/pimsettingexporter %doc %lang(en) %{_kde4_htmldir}/en/contactthemeeditor %doc %lang(en) %{_kde4_htmldir}/en/sieveeditor -%{_datadir}/dbus-1/interfaces/* +%exclude %{_kde4_appsdir}/kmail2/pics/* +%exclude %{_kde4_appsdir}/knode/pics/* +%exclude %{_kde4_configdir}/messageviewer_header_themes.knsrc %{_kde4_applicationsdir}/* %{_kde4_appsdir} %{_kde4_bindir}/* +%{_kde4_configdir}/libkleopatrarc %{_kde4_configkcfgdir} +%{_kde4_datadir}/dbus-1/interfaces/* %{_kde4_iconsdir}/hicolor %{_kde4_iconsdir}/oxygen %{_kde4_libdir}/*.so.* %{_kde4_mandir}/man1/kabcclient.1.gz %{_kde4_modulesdir}/* %{_kde4_servicesdir} -%exclude %{_kde4_appsdir}/kmail2/pics/* -%exclude %{_kde4_appsdir}/knode/pics/* -%exclude %{_kde4_configdir}/messageviewer_header_themes.knsrc %changelog ++++++ desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.PVMy64/_old 2014-07-16 16:19:40.000000000 +0200 +++ /var/tmp/diff_new_pack.PVMy64/_new 2014-07-16 16:19:40.000000000 +0200 @@ -19,10 +19,10 @@ X-DBUS-StartupType=Multi -Categories=Qt;KDE;Utility;Office;Monitor;X-KDE-Utilities-PIM; +Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM; -Index: kleopatra/kleopatra.desktop +Index: kleopatra/data/kleopatra.desktop =================================================================== ---- kleopatra/kleopatra.desktop.orig -+++ kleopatra/kleopatra.desktop +--- kleopatra/data/kleopatra.desktop.orig ++++ kleopatra/data/kleopatra.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application ++++++ kdepim-4.13.2.tar.xz -> kdepim-4.13.80.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdepim4/kdepim-4.13.2.tar.xz /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim-4.13.80.tar.xz differ: char 26, line 1 ++++++ reenable-some-docs.diff ++++++ commit ec8ff5d92ced24a9f280c22e3d21bd3d43975511 Author: Christophe Giboudeaux <cgiboude...@gmx.com> Date: Fri Jul 11 15:11:18 2014 +0200 Reenable some subdirs. diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 84b54fe..c72d93a 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -54,7 +54,8 @@ if(BUILD_ktnef) add_subdirectory(ktnef) endif() -if(BUILD_headerthemeeditor) +if(BUILD_grantleeeditor) + add_subdirectory(contactthemeeditor) add_subdirectory(headerthemeeditor) endif() @@ -81,6 +82,3 @@ if(BUILD_sieveeditor) add_subdirectory(sieveeditor) endif() -if(BUILD_contactthemeeditor) - add_subdirectory(contactthemeeditor) -endif() -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
