rpms/kdepim/F-11 kdepim-4.4.1-kontact-startup.patch, NONE, 1.1 .cvsignore, 1.69, 1.70 kdepim.spec, 1.232, 1.233 sources, 1.77, 1.78 kdepim-4.1.80-libqgpgme-link-fix.patch, 1.1, NONE kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch, 1.1, NONE

Wed Feb 10 16:21:31 UTC 2010

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2636/F-11

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-4.4.1-kontact-startup.patch 
Removed Files:
	kdepim-4.1.80-libqgpgme-link-fix.patch 
	kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch 
Log Message:
sync w/devel


kdepim-4.4.1-kontact-startup.patch:
 main.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-4.4.1-kontact-startup.patch ---
--- kdepim/kontact/src/main.cpp	2010/02/09 14:39:36	1087777
+++ kdepim/kontact/src/main.cpp	2010/02/09 14:44:07	1087778
@@ -138,7 +138,6 @@
         mMainWindow->setInitialActivePluginModule( moduleName );
       }
       mMainWindow->show();
-      Akonadi::Control::start( mMainWindow );
       KontactInterface::UniqueAppHandler::setMainWidget( mMainWindow );
       // --iconify is needed in kontact, although kstart can do that too,
       // because kstart returns immediately so it's too early to talk D-Bus to the app.
@@ -200,6 +199,10 @@
 
   KontactApp app;
 
+  // KDE 4.4: do akonadi startup before creating any window, since creating
+  // the window loads kmail. In 4.5 we'll do this startup async instead.
+  Akonadi::Control::start( 0 );
+
   // Qt doesn't treat the system tray as a window, and therefore Qt would quit
   // the event loop when an error message is clicked away while Kontact is in the
   // tray.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	26 Jan 2010 13:13:41 -0000	1.69
+++ .cvsignore	10 Feb 2010 16:21:30 -0000	1.70
@@ -1 +1,2 @@
-kdepim-4.3.5.tar.bz2
+kdepim-4.3.98.tar.bz2
+kdepim-4.4.0.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- kdepim.spec	26 Jan 2010 13:13:41 -0000	1.232
+++ kdepim.spec	10 Feb 2010 16:21:31 -0000	1.233
@@ -1,12 +1,9 @@
-%ifnarch s390 s390x
-%define _with_pilot_link 1
-%endif
 
 Name:    kdepim
-Summary: PIM (Personal Information Manager) applications
+Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.5
-Release: 1%{?dist}
+Version: 4.4.0
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -14,21 +11,27 @@ URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
-# add -fno-var-tracking-assignments for kmail/globalsettings_base.cpp (#538233)
-Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch
 
-# upstream patches (4.3 branch):
+# upstream patches
+Patch100: kdepim-4.4.1-kontact-startup.patch
+
+Obsoletes: bilbo < 1:1.0
+%if 0%{?fedora} < 13
+Provides:  bilbo = 1:1.0
+%endif
 
 Provides: kdepim4 = %{version}-%{release}
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-# Upgrade path
-%if 0%{?fedora} && 0%{?fedora} < 12
+# beware bootstrapping (ie, build kdepim-runtime first)
 Requires: kdepim-runtime%{?_isa} >= %{version}
+
+%if 0%{?fedora} < 13
+# upgrade path
+Requires: kpilot
 %endif
 
 BuildRequires: akonadi-devel
@@ -36,11 +39,9 @@ BuildRequires: bison flex
 BuildRequires: boost-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: desktop-file-utils
-BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel
-BuildRequires: libassuan-devel
+BuildRequires: libassuan-static, libassuan-devel
 BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
 # TODO: libmapi from http://www.openchange.org/
@@ -48,11 +49,6 @@ BuildRequires: libXpm-devel libXScrnSave
 # Not used, has broken deps to boot -- Rex
 #BuildRequires: libopensync-devel
 BuildRequires: libxslt-devel
-%if 0%{?_with_pilot_link:1}
-# libmal currently not used, recheck with kdepim-4.3
-#BuildRequirs: libmal-devel >= 0.40
-BuildRequires: pilot-link-devel >= 0.12
-%endif
 BuildRequires: python-devel
 BuildRequires: soprano-devel
 BuildRequires: qca2-devel
@@ -69,12 +65,12 @@ Requires(hint): spambayes
 %description
 %{summary}, including:
 * akregator: feed aggregator
+* blogilo: blogging application, focused on simplicity and usability
 * kmail: email client
 * knode: newsreader
 * knotes: sticky notes for the desktop
 * kontact: integrated PIM management
 * korganizer: journal, appointments, events, todos
-%{?_with_pilot_link:* kpilot: HotSync® software for Palm OS® devices}
 
 %package devel
 Summary: Development files for %{name}
@@ -91,17 +87,17 @@ Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if ! 0%{?devel}
+Obsoletes: kdepim-devel < 6:4.3.95-1
+%endif
 %description libs
 %{summary}.
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .libqgpgme-link-fix
+%setup -q -n kdepim-%{version}%{?alphatag}
 %patch1 -p0 -b .kmail-saveAttachments
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
-%patch2 -p1 -b .kmail_globalsettings_no_var_tracking
-%endif
+%patch100 -p1 -b .kontact-startup
 
 
 %build
@@ -129,6 +125,11 @@ for i in *; do
 done
 popd
 
+# unpackaged files
+%if ! 0%{?devel}
+rm -f %{buildroot}%{_kde4_libdir}/lib*.so
+%endif
+
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -168,13 +169,14 @@ rm -rf %{buildroot}
 %doc README README.Kolab
 %doc COPYING
 %{_kde4_bindir}/*
-%if 0%{?_with_pilot_link:1}
-%{_kde4_libdir}/libkpilot_*.so
-%endif
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
+%{_kde4_datadir}/akonadi/agents/*.desktop
 %{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/akonadi/contact/editorpageplugins/cryptopageplugin.so
+%{_kde4_appsdir}/akonadiconsole/
 %{_kde4_appsdir}/akregator/
+%{_kde4_appsdir}/blogilo/
 %{_kde4_appsdir}/kaddressbook/
 %{_kde4_appsdir}/kalarm/
 %{_kde4_appsdir}/kconf_update/*
@@ -190,49 +192,105 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kontactsummary/
 %{_kde4_appsdir}/korgac/
 %{_kde4_appsdir}/korganizer/
-%if 0%{?_with_pilot_link:1}
-%{_kde4_appsdir}/kpilot/
-%endif
 %{_kde4_appsdir}/ktimetracker/
 %{_kde4_appsdir}/kwatchgnupg/
 %{_kde4_appsdir}/libkdepim/
 %{_kde4_appsdir}/libkleopatra/
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/autostart/*.desktop
 %{_kde4_datadir}/config/*rc
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_docdir}/HTML/en/*
+%{_mandir}/man*/*.gz
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/plugins/designer/*.so
 
+%if 0%{?devel}
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%if 0%{?_with_pilot_link:1}
-%exclude %{_kde4_libdir}/libkpilot_*.so
 %endif
 
 
 %changelog
-* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
-- 4.3.5
+* Tue Feb 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.0-3
+- drop BR: gnokii-devel (not used)
+- drop var-tracking patch (gcc fixed)
+
+* Tue Feb 09 2010 Lukas Tinkl <ltinkl at redhat.com> - 6:4.4.0-2
+- fix Kontact startup
+
+* Fri Feb 05 2010 Than Ngo <than at redhat.com> - 6:4.4.0-1
+- 4.4.0
+
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
+- KDE 4.3.98 (4.4rc3)
+
+* Wed Jan 20 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.3.95-1
+- KDE 4.3.95 (4.4rc2)
+- -libs: Obsoletes: kdepim-devel (headers went awol)
+
+* Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-2
+- rebuild (boost)
+
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- kde-4.3.90 (4.4rc1)
+
+* Thu Dec 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-4
+- dt_validate patch
+
+* Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-3.1
+- Requires: kpilot for upgrade path (F12-)
+
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
+- unconditionally Requires: kdepim-runtime  (#549413)
+
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
+- Obsoletes/Provides: bilbo
+- %%description: +blogilo
+
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-6
+- Repositioning the KDE Brand (#547361)
+
+* Fri Dec 11 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.3.80-5
+- KPilot is no longer part of kdepim
+  (see http://bertjan.broeksemaatjes.nl/node/50)
+
+* Wed Dec 09 2009 Than Ngo <than at redhat.com> - 4.3.80-4
+- apply upstream patch to fix crash in Kontact+KOrganizer with Qt4.6
+
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 4.3.80-3
+- Explicitly BR libassuan-static in accordance with the Packaging
+  Guidelines (libassuan-devel is still static-only).
+
+* Tue Dec 08 2009 Than Ngo <than at redhat.com> - 4.3.80-2
+- drop BR kdelibs-experimental
+
+* Tue Dec  1 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
+* Fri Nov 27 2009 Than Ngo <than at redhat.com> - 4.3.75-0.3.svn1048496
+- fix build issue on s390(x)
 
-* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-2
-- upstream korganizer monthview patch
+* Tue Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.2.svn1048496
+- Add patch to build kalarm
 
-* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
-- 4.3.4
+* Sun Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
+- Update to 4.3.75 snapshot
 
-* Fri Nov 27 2009 Than Ngo <than at redhat.com> - 4.3.3-3
-- fix build issue on s390
+* Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-3
+- -fno-var-tracking-assignments for kmail/globalsettings_global.cpp (#538233)
 
 * Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup, fix conditional for RHEL
@@ -282,7 +340,7 @@ rm -rf %{buildroot}
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
-- 4.3rc3 
+- 4.3rc3
 
 * Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
 - 4.3rc2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	26 Jan 2010 13:13:41 -0000	1.77
+++ sources	10 Feb 2010 16:21:31 -0000	1.78
@@ -1 +1 @@
-641721181c10c6d8ed229a7dd4b20ddf  kdepim-4.3.5.tar.bz2
+a354448eebd4fd4b50739c4f20b90e20  kdepim-4.4.0.tar.bz2


--- kdepim-4.1.80-libqgpgme-link-fix.patch DELETED ---


--- kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch DELETED ---

