Hello community,
here is the log from the commit of package kdepim4-runtime.1553 for
openSUSE:12.3:Update checked in at 2013-04-22 11:31:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/kdepim4-runtime.1553 (Old)
and /work/SRC/openSUSE:12.3:Update/.kdepim4-runtime.1553.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4-runtime.1553", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2013-04-05 00:01:41.916011506 +0200
+++
/work/SRC/openSUSE:12.3:Update/.kdepim4-runtime.1553.new/kdepim4-runtime.changes
2013-04-22 11:31:48.000000000 +0200
@@ -0,0 +1,1076 @@
+-------------------------------------------------------------------
+Mon Apr 1 19:12:09 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.10.2 \n * Bugfixes
+- Removed kdepim4-runtime_add_owncloud5_servicefile.diff patch as
+ it was included upstream
+
+-------------------------------------------------------------------
+Mon Mar 25 16:43:23 UTC 2013 - stefan.bru...@rwth-aachen.de
+
+- update Caldav/Carddav service file for owncloud5
+ fixes kde#314711, picked from upstream
+
+-------------------------------------------------------------------
+Sat Mar 2 15:34:56 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.10.1
+ * Contains bug fixes. See http://www.kde.org/announcements/
+ for more information
+
+-------------------------------------------------------------------
+Thu Jan 31 17:45:36 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.10.0
+ * This is the final release for 4.10. Contains bugfixes
+
+-------------------------------------------------------------------
+Thu Jan 17 08:03:19 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.9.98
+ * This is the third RC release for 4.10. Contains bugfixes
+
+-------------------------------------------------------------------
+Thu Jan 3 21:07:33 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.9.97
+ * This is the second RC release for 4.10. Contains bugfixes
+
+-------------------------------------------------------------------
+Wed Dec 19 18:35:31 UTC 2012 - tittiatc...@gmail.com
+
+- Update to 4.9.95
+ * This is the first RC release for 4.10. Contains bugfixes
+
+-------------------------------------------------------------------
+Sat Dec 1 20:01:32 UTC 2012 - tittiatc...@gmail.com
+
+- Update to 4.9.90
+ * This is the second Beta release for 4.10. Contains bugfixes
+
+-------------------------------------------------------------------
+Sun Nov 25 13:08:04 UTC 2012 - cgiboude...@gmx.com
+
+- Add buildfix-qjson_0_8_0.diff. Fixes build with QJson 0.8.0
+
+-------------------------------------------------------------------
+Sun Nov 25 11:25:54 UTC 2012 - tittiatc...@gmail.com
+
+- Drop patch 4_8_branch.diff as it is not used at all
+
+-------------------------------------------------------------------
+Sat Nov 24 12:49:51 UTC 2012 - tittiatc...@gmail.com
+
+- Update to 4.9.80
+ * See http://www.kde.org/announcements/announce-4.10-beta1.php
+
+-------------------------------------------------------------------
+Fri Nov 2 16:47:04 UTC 2012 - tittiatc...@gmail.com
+
+- Update to 4.9.3
+ * see http://kde.org/announcements/announce-4.9.3.php for details
+
+-------------------------------------------------------------------
+Sat Sep 29 09:55:32 UTC 2012 - tittiatc...@gmail.com
+
+- Update to 4.9.2
+ * see http://kde.org/announcements/announce-4.9.2.php for details
+
+-------------------------------------------------------------------
+Tue Sep 11 12:01:18 UTC 2012 - cgiboude...@gmx.com
+
+- Add a provides/obsoletes entry for akonadi-google.
+This resource is part of kdepim-runtime since 4.9
+- Add BuildRequires: libkgapi-devel and libkolab-devel to build
+ more Akonadi resources
+
+-------------------------------------------------------------------
+Wed Sep 5 12:03:34 UTC 2012 - dmuel...@suse.com
+
+- update to 4.9.1
+ * see http://kde.org/announcements/4.9.1/ for details
+
+
+-------------------------------------------------------------------
+Mon Jul 30 16:52:17 UTC 2012 - dmuel...@suse.com
+
+- update to 4.8.5
+ * see http://kde.org/announcements/changelogs/changelog4_8_4to4_8_5.php for
details
+
+-------------------------------------------------------------------
+Fri Jun 1 13:54:09 UTC 2012 - dmuel...@suse.com
+
+- update to 4.8.4
+ * see http://kde.org/announcements/changelogs/changelog4_8_3to4_8_4.php for
details
+
+-------------------------------------------------------------------
+Sun Apr 29 20:55:49 UTC 2012 - dmuel...@suse.com
+
+- update to 4.8.3
+ * see http://kde.org/announcements/changelogs/changelog4_8_2to4_8_3.php for
details
+
+-------------------------------------------------------------------
+Sat Apr 14 15:28:50 UTC 2012 - dmuel...@suse.com
+
+- fix build dependency on kdepimlibs
+
+-------------------------------------------------------------------
+Mon Apr 2 20:32:29 UTC 2012 - wstephen...@suse.com
+
+- Fix kde#297039 - KAlarm/Kontact crash
+
+-------------------------------------------------------------------
+Sat Mar 31 11:49:59 UTC 2012 - wstephen...@suse.com
+
+- Add xz to BuildRequires
+
+-------------------------------------------------------------------
+Fri Mar 30 01:14:24 CEST 2012 - dmuel...@suse.de
+
+- update to 4.8.2
+ * see http://kde.org/announcements/changelogs/changelog4_8_1to4_8_2.php for
details
+
+-------------------------------------------------------------------
+Fri Mar 2 23:15:29 CET 2012 - dmuel...@suse.de
+
+- update to 4.8.1
+ * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for
details
+
+-------------------------------------------------------------------
+Sun Feb 19 19:09:04 UTC 2012 - gra...@andtech.eu
+
+- Add trueg's patch to fix virtuoso cpu thrashing and generally
+ make the indexing feeders behave better.
+ * see https://bugs.kde.org/show_bug.cgi?id=289932
+
+-------------------------------------------------------------------
+Wed Jan 18 20:57:43 CET 2012 - dmuel...@suse.de
+
+- update to 4.8.0
+ * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
+Tue Jan 10 16:32:40 CET 2012 - dmuel...@suse.de
+
+- update to 4.7.98
+ * RC2+ milestone release of KDE 4.8
+ * see http://kde.org/announcements/4.8/ for details
+- rename 4_7_BRANCH.diff to 4_8_BRANCH.diff
+- remove upstreamed patches
+
+-------------------------------------------------------------------
+Wed Dec 7 11:30:46 UTC 2011 - co...@suse.com
+
+- fix license to be in spdx.org format
+
+-------------------------------------------------------------------
+Fri Dec 2 12:30:17 UTC 2011 - idoen...@suse.de
+
+- Make sure Kmail removes Bcc header befor sending mail,
+ kde#263587
+
+-------------------------------------------------------------------
+Fri Dec 2 01:58:59 CET 2011 - dmuel...@suse.de
+
+- update to 4.7.4
+ * see http://kde.org/announcements/changelogs/changelog4_7_3to4_7_4.php for
details
+
+-------------------------------------------------------------------
+Wed Nov 2 20:23:21 CET 2011 - dmuel...@suse.de
+
+- update to 4.7.3
+ * see http://kde.org/announcements/changelogs/changelog4_7_2to4_7_3.php for
details
+
+-------------------------------------------------------------------
+Wed Oct 19 14:27:17 UTC 2011 - wstephen...@suse.com
+
+- Add 4.7 branch diff
+- Remove localfolderscollectionmigrator.diff, in branch diff
+
+-------------------------------------------------------------------
+Mon Oct 10 17:59:18 UTC 2011 - jav...@opensuse.org
+
+- Add patch to avoid duplicate messages during migration from kmail1
+ (bko #283467)
+
++++ 879 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:12.3:Update/.kdepim4-runtime.1553.new/kdepim4-runtime.changes
New:
----
akonadi.png
buildfix-qjson_0_8_0.diff
disable-knut.diff
kdepim-runtime-4.10.2.tar.xz
kdepim4-runtime.changes
kdepim4-runtime.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4-runtime.spec ++++++
#
# spec file for package kdepim4-runtime
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: kdepim4-runtime
Version: 4.10.2
Release: 0
Summary: Base package of kdepim
License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
Source0: kdepim-runtime-%{version}.tar.xz
Source1: akonadi.png
Patch0: buildfix-qjson_0_8_0.diff
Patch1: disable-knut.diff
BuildRequires: fdupes
BuildRequires: libkdepimlibs4-devel >= %{version}
BuildRequires: libkgapi-devel >= 0.4.0
BuildRequires: libkolab-devel >= 0.2.0
BuildRequires: nepomuk-core-devel
BuildRequires: xz
Suggests: kontact
Obsoletes: kde4-akonadi < 4.2.90
Provides: kde4-akonadi = 4.2.90
Obsoletes: kdepim4-runtime-devel < 4.5.81svn1202101
Provides: kdepim4-runtime-devel = 4.5.81svn1202101
Obsoletes: akonadi-google <= 0.3.1
Provides: akonadi-google = 0.3.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_akonadi_requires
%kde4_pimlibs_requires
%kde4_runtime_requires
%description
This package contains the Akonadi files of the kdepim module.
%prep
%setup -q -n kdepim-runtime-%{version}
%patch0 -p1
%patch1
%build
%ifarch ppc64
RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
%cmake_kde4 -d build
%make_jobs
%install
cd build
%kde4_makeinstall
cd ..
#remove menu entries of development tools
mkdir -p %{buildroot}%{_kde4_datadir}/pixmaps
install $RPM_SOURCE_DIR/akonadi.png %{buildroot}%{_kde4_datadir}/pixmaps/
%suse_update_desktop_file -u akonaditray Network Email
%fdupes -s %{buildroot}
# remove stuff we don't want to package
rm %{buildroot}%_kde4_libdir/libakonadi*.so
rm %{buildroot}%_kde4_libdir/libkmindexreader.so
rm %{buildroot}%_kde4_libdir/libmaildir.so
%kde_post_install
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
rm -rf filelists
%files
%defattr(-,root,root)
%{_kde4_applicationsdir}/accountwizard.desktop
%{_kde4_applicationsdir}/akonaditray.desktop
%{_kde4_appsdir}/akonadi
%{_kde4_appsdir}/akonadi_maildispatcher_agent/
%{_kde4_appsdir}/akonadi_nepomuk_feeder/
%{_kde4_appsdir}/nepomukpimindexerutility/
%{_kde4_bindir}/*
%{_kde4_configdir}/*
%{_kde4_datadir}/akonadi
%{_kde4_datadir}/autostart/kaddressbookmigrator.desktop
%{_kde4_datadir}/dbus-1/interfaces/*
%{_kde4_datadir}/mime/packages/*.xml
%{_kde4_datadir}/ontology/kde/
%{_kde4_datadir}/pixmaps/akonadi.png
%{_kde4_iconsdir}/hicolor/*/apps/*.png
%{_kde4_libdir}/libakonadi-filestore.so.4*
%{_kde4_libdir}/libakonadi-xml.so.4*
%{_kde4_libdir}/libkdepim-copy.so
%{_kde4_libdir}/libkdepim-copy.so.4*
%{_kde4_libdir}/libkmindexreader.so.4*
%{_kde4_libdir}/libmaildir.so.4*
%{_kde4_libdir}/libnepomukfeederpluginlib.a
%{_kde4_modulesdir}/*
%{_kde4_servicetypesdir}/akonadinepomukfeeder.desktop
%{_kde4_servicetypesdir}/davgroupwareprovider.desktop
%{_kde4_sharedir}/services
%changelog
++++++ buildfix-qjson_0_8_0.diff ++++++
commit ca06d09b6b78381bb152deb02c31ecb9d6a43210
Author: Christophe Giboudeaux <cgiboude...@gmx.com>
Date: Sat Nov 24 21:53:56 2012 +0100
Fix build with QJson >= 0.8.0
diff --git a/resources/google/calendar/CMakeLists.txt
b/resources/google/calendar/CMakeLists.txt
index 5879cb1..b118d8e 100644
--- a/resources/google/calendar/CMakeLists.txt
+++ b/resources/google/calendar/CMakeLists.txt
@@ -1,5 +1,10 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+# QJson 0.8.0 is BIC
+if(QJSON_VERSION VERSION_GREATER 0.7.1)
+ add_definitions(-DUSE_QJSON_0_8)
+endif()
+
include_directories(${QJSON_INCLUDE_DIR} ${qjson_INCLUDE_DIR})
set(calendarresource_SRCS
diff --git a/resources/google/calendar/defaultreminderattribute.cpp
b/resources/google/calendar/defaultreminderattribute.cpp
index 879a2c3..7dc45b4 100644
--- a/resources/google/calendar/defaultreminderattribute.cpp
+++ b/resources/google/calendar/defaultreminderattribute.cpp
@@ -79,7 +79,11 @@ QByteArray DefaultReminderAttribute::serialized() const
}
QJson::Serializer serializer;
+ #if !defined( USE_QJSON_0_8 )
return serializer.serialize( list );
+ #else
+ return serializer.serialize( list, 0 );
+ #endif
}
Alarm::List DefaultReminderAttribute::alarms( Incidence *incidence ) const
++++++ disable-knut.diff ++++++
--- resources/CMakeLists.txt.orig 2010-07-17 15:43:52.982914971 +0200
+++ resources/CMakeLists.txt 2010-07-17 15:43:58.658928661 +0200
@@ -45,7 +45,7 @@
if (NOT WINCE)
add_subdirectory( birthdays )
- add_subdirectory( knut )
+ #add_subdirectory( knut )
add_subdirectory( mixedmaildir )
add_subdirectory( mailtransport_dummy )
add_subdirectory( mbox )
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
