rpms/kdepim/F-7 crystalsvg-conflicts.txt, NONE, 1.1 kdepim-3.5.9-kde#127696.patch, NONE, 1.1 kdepim-3.5.9-opensync03.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 kdepim.spec, 1.134, 1.135 sources, 1.45, 1.46 kdepim-3.5.7-kde#146967.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Feb 15 22:21:11 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdepim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14650
Modified Files:
.cvsignore kdepim.spec sources
Added Files:
crystalsvg-conflicts.txt kdepim-3.5.9-kde#127696.patch
kdepim-3.5.9-opensync03.patch
Removed Files:
kdepim-3.5.7-kde#146967.patch
Log Message:
rawhide sync
--- NEW FILE crystalsvg-conflicts.txt ---
akregator_empty.png
button_fewer.png
button_more.png
gpg.png
gpgsm.png
kalarm.png
kmailcvt.png
kmaillight.png
konsolekalendar.png
kontact_contacts.png
kontact_date.png
kontact_journal.png
kontact_mail.png
kontact_news.png
kontact_notes.png
kontact_summary_green.png
kontact_summary.png
kontact_todo.png
kpalmdoc.png
rss_tag.png
kdepim-3.5.9-kde#127696.patch:
--- NEW FILE kdepim-3.5.9-kde#127696.patch ---
Index: kmail/popaccount.h
===================================================================
--- kmail/popaccount.h (revision 775014)
+++ kmail/popaccount.h (revision 775015)
@@ -150,6 +150,7 @@
QMap<QString, int> mTimeOfNextSeenMsgsMap; // map of uid to times of seen messages
QDict<int> mSizeOfNextSeenMsgsDict;
QStringList idsOfMsgsToDelete;
+ QStringList idsOfForcedDeletes;
int indexOfCurrentMsg;
QValueList<KMMessage*> msgsAwaitingProcessing;
Index: kmail/popaccount.cpp
===================================================================
--- kmail/popaccount.cpp (revision 775014)
+++ kmail/popaccount.cpp (revision 775015)
@@ -389,6 +389,8 @@
idsOfMsgs.clear();
mUidForIdMap.clear();
idsOfMsgsToDelete.clear();
+ idsOfForcedDeletes.clear();
+
//delete any headers if there are some this have to be done because of check again
headersOnServer.clear();
headers = false;
@@ -735,6 +737,12 @@
idsOfMsgsToDelete.remove( it.key().second );
}
}
+
+ if ( !idsOfForcedDeletes.isEmpty() ) {
+ idsOfMsgsToDelete += idsOfForcedDeletes;
+ idsOfForcedDeletes.clear();
+ }
+
// If there are messages to delete then delete them
if ( !idsOfMsgsToDelete.isEmpty() ) {
stage = Dele;
@@ -923,8 +931,8 @@
QString qdata = data;
qdata = qdata.simplifyWhiteSpace(); // Workaround for Maillennium POP3/UNIBOX
int spc = qdata.find( ' ' );
- if (spc > 0) {
- if (stage == List) {
+ if ( stage == List ) {
+ if ( spc > 0 ) {
QString length = qdata.mid(spc+1);
if (length.find(' ') != -1) length.truncate(length.find(' '));
int len = length.toInt();
@@ -933,46 +941,76 @@
idsOfMsgs.append( id );
mMsgsPendingDownload.insert( id, len );
}
- else { // stage == Uidl
- const QString id = qdata.left(spc);
- const QString uid = qdata.mid(spc + 1);
- int *size = new int; //malloc(size_of(int));
- *size = mMsgsPendingDownload[id];
- mSizeOfNextSeenMsgsDict.insert( uid, size );
- if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) {
+ else {
+ stage = Idle;
+ if ( job ) job->kill();
+ job = 0;
+ mSlave = 0;
+ KMessageBox::error( 0, i18n( "Unable to complete LIST operation." ),
+ i18n( "Invalid Response From Server") );
+ return;
+ }
+ }
+ else { // stage == Uidl
+ Q_ASSERT ( stage == Uidl);
- if ( mMsgsPendingDownload.contains( id ) ) {
- mMsgsPendingDownload.remove( id );
- }
- else
- kdDebug(5006) << "PopAccount::slotData synchronization failure." << endl;
- idsOfMsgsToDelete.append( id );
- mUidsOfNextSeenMsgsDict.insert( uid, (const int *)1 );
- if ( mTimeOfSeenMsgsVector.empty() ) {
- mTimeOfNextSeenMsgsMap.insert( uid, time(0) );
- }
- else {
- // cast the int* with a long to can convert it to a int, BTW
- // works with g++-4.0 and amd64
- mTimeOfNextSeenMsgsMap.insert( uid,
- mTimeOfSeenMsgsVector[(int)( long )mUidsOfSeenMsgsDict[uid] - 1] );
- }
+ QString id;
+ QString uid;
+
+ if ( spc <= 0 ) {
+ // an invalid uidl line. we might just need to skip it, but
+ // some servers generate invalid uids with valid ids. in that
+ // case we will just make up a uid - which will cause us to
+ // not cache the document, but we will be able to interoperate
+
+ int testid = atoi ( qdata.ascii() );
+ if ( testid < 1 ) {
+ // we'll just have to skip this
+ kdDebug(5006) << "PopAccount::slotData skipping UIDL entry due to parse error "
+ << endl << qdata.ascii() << endl;
+ return;
}
- mUidForIdMap.insert( id, uid );
+ id.setNum (testid, 10);
+
+ QString datestring, serialstring;
+
+ serialstring.setNum ( ++dataCounter, 10 );
+ datestring.setNum ( time(NULL),10 );
+ uid = QString( "uidlgen" ) + datestring + QString( "." ) + serialstring;
+ kdDebug(5006) << "PopAccount::slotData message " << id.ascii()
+ << "%d has bad UIDL, cannot keep a copy on server" << endl;
+ idsOfForcedDeletes.append( id );
}
+ else {
+ id = qdata.left( spc );
+ uid = qdata.mid( spc + 1 );
+ }
+
+ int *size = new int; //malloc(size_of(int));
+ *size = mMsgsPendingDownload[id];
+ mSizeOfNextSeenMsgsDict.insert( uid, size );
+ if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) {
+ if ( mMsgsPendingDownload.contains( id ) ) {
+ mMsgsPendingDownload.remove( id );
+ }
+ else
+ kdDebug(5006) << "PopAccount::slotData synchronization failure." << endl;
+ idsOfMsgsToDelete.append( id );
+ mUidsOfNextSeenMsgsDict.insert( uid, (const int *)1 );
+ if ( mTimeOfSeenMsgsVector.empty() ) {
+ mTimeOfNextSeenMsgsMap.insert( uid, time(0) );
+ }
+ else {
+ // cast the int* with a long to can convert it to a int, BTW
+ // works with g++-4.0 and amd64
+ mTimeOfNextSeenMsgsMap.insert( uid, mTimeOfSeenMsgsVector[(int)( long )
+ mUidsOfSeenMsgsDict[uid] - 1] );
+ }
+ }
+ mUidForIdMap.insert( id, uid );
}
- else {
- stage = Idle;
- if (job) job->kill();
- job = 0;
- mSlave = 0;
- KMessageBox::error(0, i18n( "Unable to complete LIST operation." ),
- i18n("Invalid Response From Server"));
- return;
- }
}
-
//-----------------------------------------------------------------------------
void PopAccount::slotResult( KIO::Job* )
{
kdepim-3.5.9-opensync03.patch:
--- NEW FILE kdepim-3.5.9-opensync03.patch ---
Index: libqopensync/environment.cpp
===================================================================
--- libqopensync/environment.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
+++ libqopensync/environment.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -1,172 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe at kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "environment.h"
-
-#include <opensync/opensync.h>
-
-using namespace QSync;
-
-Environment::Environment()
-{
- mEnvironment = osync_env_new();
-}
-
-Environment::~Environment()
-{
- osync_env_free( mEnvironment );
-}
-
-Environment::GroupIterator Environment::groupBegin()
-{
- GroupIterator it( this );
- it.mPos = 0;
-
- return it;
-}
-
-Environment::GroupIterator Environment::groupEnd()
-{
- GroupIterator it( this );
- it.mPos = groupCount();
-
- return it;
-}
-
-Environment::PluginIterator Environment::pluginBegin()
-{
- PluginIterator it( this );
- it.mPos = 0;
-
- return it;
-}
-
-Environment::PluginIterator Environment::pluginEnd()
-{
- PluginIterator it( this );
- it.mPos = pluginCount();
-
- return it;
-}
-
-Result Environment::initialize()
-{
- OSyncError *error = 0;
- if ( !osync_env_initialize( mEnvironment, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-Result Environment::finalize()
-{
- OSyncError *error = 0;
- if ( !osync_env_finalize( mEnvironment, &error ) )
- return Result( &error);
- else
- return Result();
-}
-
-int Environment::groupCount() const
-{
- return osync_env_num_groups( mEnvironment );
-}
-
-Group Environment::groupAt( int pos ) const
-{
- Group group;
-
- if ( pos < 0 || pos >= groupCount() )
- return group;
-
- OSyncGroup *ogroup = osync_env_nth_group( mEnvironment, pos );
- group.mGroup = ogroup;
-
- return group;
-}
-
-Group Environment::groupByName( const QString &name ) const
-{
- Group group;
-
- OSyncGroup *ogroup = osync_env_find_group( mEnvironment, name.latin1() );
- if ( ogroup )
- group.mGroup = ogroup;
-
- return group;
-}
-
-Group Environment::addGroup()
-{
- Group group;
-
- OSyncGroup *ogroup = osync_group_new( mEnvironment );
- if ( ogroup )
- group.mGroup = ogroup;
-
- return group;
-}
-
-Result Environment::removeGroup( const Group &group )
-{
- OSyncError *error = 0;
- if ( !osync_group_delete( group.mGroup, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-int Environment::pluginCount() const
-{
- return osync_env_num_plugins( mEnvironment );
-}
-
-Plugin Environment::pluginAt( int pos ) const
-{
- Plugin plugin;
-
- if ( pos < 0 || pos >= pluginCount() )
- return plugin;
-
- OSyncPlugin *oplugin = osync_env_nth_plugin( mEnvironment, pos );
- plugin.mPlugin = oplugin;
-
- return plugin;
-}
-
-Plugin Environment::pluginByName( const QString &name ) const
-{
- Plugin plugin;
-
- OSyncPlugin *oplugin = osync_env_find_plugin( mEnvironment, name.latin1() );
- if ( oplugin )
- plugin.mPlugin = oplugin;
-
- return plugin;
-}
-
-Conversion Environment::conversion() const
-{
- Conversion conversion;
- conversion.mEnvironment = mEnvironment;
-
- return conversion;
-}
Index: libqopensync/environment.h
===================================================================
--- libqopensync/environment.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
+++ libqopensync/environment.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -1,199 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe at kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
[...3250 lines suppressed...]
mSynchronizing = true;
mSyncAction->setText( "Abort Synchronization" );
break;
- case QSync::SyncEngineUpdate::EndPhaseRead:
+ case QSync::SyncEngineUpdate::Read:
mStatus->setText( i18n( "Data read" ) );
break;
- case QSync::SyncEngineUpdate::EndPhaseWrite:
+ case QSync::SyncEngineUpdate::Written:
mStatus->setText( i18n( "Data written" ) );
mProgressBar->setProgress( 100 );
mProcessedItems = mMaxProcessedItems = 0;
break;
- case QSync::SyncEngineUpdate::EndPhaseDisconnected:
+ case QSync::SyncEngineUpdate::Disconnected:
mStatus->setText( i18n( "Disconnected" ) );
break;
case QSync::SyncEngineUpdate::Error:
@@ -257,7 +250,7 @@
mSynchronizing = false;
mSyncAction->setText( i18n( "Synchronize Now" ) );
break;
- case QSync::SyncEngineUpdate::SyncSuccessfull:
+ case QSync::SyncEngineUpdate::SyncSuccessful:
mStatus->setText( i18n( "Successfully synchronized" ) );
mSyncProcess->group().setLastSynchronization( QDateTime::currentDateTime() );
mSyncProcess->group().save();
@@ -288,30 +281,24 @@
case QSync::SyncMemberUpdate::Connected:
(*it)->setStatusMessage( i18n( "Connected" ) );
break;
- case QSync::SyncMemberUpdate::SentChanges:
+ case QSync::SyncMemberUpdate::Read:
(*it)->setStatusMessage( i18n( "Changes read" ) );
break;
- case QSync::SyncMemberUpdate::CommittedAll:
+ case QSync::SyncMemberUpdate::Written:
(*it)->setStatusMessage( i18n( "Changes written" ) );
break;
case QSync::SyncMemberUpdate::Disconnected:
(*it)->setStatusMessage( i18n( "Disconnected" ) );
break;
- case QSync::SyncMemberUpdate::ConnectError:
- (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+ case QSync::SyncMemberUpdate::SyncDone:
+ (*it)->setStatusMessage( i18n( "Synchronization done" ) );
break;
- case QSync::SyncMemberUpdate::GetChangesError:
- (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+ case QSync::SyncMemberUpdate::Discovered:
+ (*it)->setStatusMessage( i18n( "Discovered" ) );
break;
- case QSync::SyncMemberUpdate::CommittedAllError:
+ case QSync::SyncMemberUpdate::Error:
(*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
break;
- case QSync::SyncMemberUpdate::SyncDoneError:
- (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
- break;
- case QSync::SyncMemberUpdate::DisconnectedError:
- (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
- break;
default:
break;
}
@@ -352,12 +339,9 @@
QFont boldFont;
boldFont.setBold( true );
- MemberInfo mi( member );
+ const MemberInfo mi( member );
+ const QPixmap icon = mi.smallIcon();
- QPixmap icon = mi.smallIcon();
-
- QSync::Plugin plugin = member.plugin();
-
QVBoxLayout *layout = new QVBoxLayout( this );
QHBox* box = new QHBox( this );
@@ -378,7 +362,14 @@
mStatus = new QLabel( box );
mMemberName->setText( member.name() );
- mDescription->setText( plugin.longName() );
+
+ const QSync::PluginEnv *env = SyncProcessManager::self()->pluginEnv();
+ const QSync::Plugin plugin = env->pluginByName( member.pluginName() );
+
+ if ( plugin.isValid() )
+ mDescription->setText( plugin.longName() );
+ else
+ mDescription->setText( i18n("Plugin \"%1\" can't get initialized!").arg( member.pluginName() ) );
}
void MemberItem::setStatusMessage( const QString &msg )
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
+++ src/Makefile.am (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -24,7 +24,7 @@
pluginpicker.cpp configgui.cpp configguiblank.cpp configguifile.cpp \
memberinfo.cpp groupconfigcommon.cpp kwidgetlist.cpp \
configguipalm.cpp conflictdialog.cpp singleconflictdialog.cpp \
- addresseediffalgo.cpp calendardiffalgo.cpp \
+ addresseediffalgo.cpp calendardiffalgo.cpp xmldiffalgo.cpp \
htmldiffalgodisplay.cpp genericdiffalgo.cpp multiconflictdialog.cpp \
configguiirmc.cpp \
configguisyncmlobex.cpp configguisyncmlhttp.cpp configguiopie.cpp \
Index: src/multiconflictdialog.cpp
===================================================================
--- src/multiconflictdialog.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
+++ src/multiconflictdialog.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -39,8 +39,10 @@
{
QGridLayout *layout = new QGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
- MemberInfo mi( change.member() );
- layout->addWidget( new QLabel( mi.name(), this ), 0, 0 );
+ // TODO change doesn't contain member as struct member .. use SyncMapping to determine the correct member.
+ //MemberInfo mi( change.member() );
+ //layout->addWidget( new QLabel( mi.name(), this ), 0, 0 );
+ layout->addWidget( new QLabel( "PORTING TODO", this ), 0, 0 );
QString type;
switch ( change.changeType() ) {
Index: src/pluginpicker.cpp
===================================================================
--- src/pluginpicker.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
+++ src/pluginpicker.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -24,7 +24,7 @@
#include "memberinfo.h"
#include "syncprocessmanager.h"
-#include <libqopensync/environment.h>
+#include <libqopensync/pluginenv.h>
#include <kdialog.h>
#include <kglobal.h>
@@ -77,12 +77,14 @@
{
mPluginList->clear();
- QSync::Environment *env = SyncProcessManager::self()->environment();
+ const QSync::PluginEnv *env = SyncProcessManager::self()->pluginEnv();
- QSync::Environment::PluginIterator it( env->pluginBegin() );
- for( ; it != env->pluginEnd(); ++it ) {
- QSync::Plugin plugin = *it;
- mPluginList->appendItem( new PluginItem( mPluginList, plugin ) );
+ for ( int i = 0; i < env->pluginCount(); ++i ) {
+ QSync::Plugin plugin = env->pluginAt( i );
+
+ if ( plugin.isValid() )
+ mPluginList->appendItem( new PluginItem( mPluginList, plugin ) );
+
}
}
Index: configure.in.bot
===================================================================
--- configure.in.bot (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
+++ configure.in.bot (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -1,7 +1,7 @@
-if test "$HAVE_OPENSYNC" = 0 -o "$HAVE_OPENSYNC_ENGINE" = 0; then
+if test "$HAVE_OPENSYNC" = 0; then
echo ""
echo "You're missing a compatible version of libopensync."
- echo "Version 0.19 or greater is needed."
+ echo "Version 0.31 or greater is needed."
echo "kitchensync will not be built."
echo ""
all_tests=bad
Index: configure.in.in
===================================================================
--- configure.in.in (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
+++ configure.in.in (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -29,9 +29,7 @@
HAVE_OPENSYNC=0
-HAVE_OPENSYNC_ENGINE=0
-PKG_CHECK_MODULES(OPENSYNC, opensync-1.0 >= 0.19, HAVE_OPENSYNC=1,HAVE_OPENSYNC=0)
-PKG_CHECK_MODULES(OPENSYNCENGINE, osengine-1.0 >= 0.19, HAVE_OPENSYNC_ENGINE=1, HAVE_OPENSYNC_ENGINE=0)
+PKG_CHECK_MODULES(OPENSYNC, opensync-1.0 >= 0.33, HAVE_OPENSYNC=1,HAVE_OPENSYNC=0)
PKG_CHECK_MODULES(LIBXML, libxml-2.0, , HAVE_OPENSYNC=0)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6, , HAVE_OPENSYNC=0)
@@ -52,9 +50,9 @@
AC_SUBST(OPENSYNC_HEADERDIR)
dnl Check if we can compile KitchenSync
-AM_CONDITIONAL(compile_kitchensync, test "$HAVE_OPENSYNC" = 1 -a "$HAVE_OPENSYNC_ENGINE" = 1)
+AM_CONDITIONAL(compile_kitchensync, test "$HAVE_OPENSYNC" = 1)
-if test "$HAVE_OPENSYNC" = 1 -a "$HAVE_OPENSYNC_ENGINE" = 1 ; then
+if test "$HAVE_OPENSYNC" = 1; then
AC_MSG_RESULT([found])
else
AC_MSG_RESULT([not found])
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 9 Jan 2008 11:13:06 -0000 1.39
+++ .cvsignore 15 Feb 2008 22:20:36 -0000 1.40
@@ -1,6 +1,4 @@
cr16-app-kandy.png
cr32-app-kandy.png
cr48-app-kandy.png
-kdepim-enterprise-svn20071013.tar.bz2
-kdepim-enterprise-svn20071129.tar.bz2
-kdepim-enterprise-svn20080109.tar.bz2
+kdepim-3.5.9.tar.bz2
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/kdepim.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- kdepim.spec 9 Jan 2008 11:23:18 -0000 1.134
+++ kdepim.spec 15 Feb 2008 22:20:36 -0000 1.135
@@ -1,8 +1,8 @@
-
## enterprise branch
-%define ent_date 20080109
-%define ent_rev 758806
+#define etch_ver 3.5.6
+#define ent_date 20080109
+#define ent_rev 744693
#define debug 1
## --enable-final requires > 1GB VM, sometimes kills fedora's builders
@@ -21,32 +21,43 @@
Name: kdepim
Summary: PIM (Personal Information Manager) applications
Epoch: 6
-Version: 3.5.8
+Version: 3.5.9
License: GPLv2
-Group: Applications/Productivity
+Group: Applications/Productivity
+URL: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://www.kde.org
%if 0%{?ent_date} > 0
+# hmm, v3.5.6 eh? FIXME? -- Rex
+#Source0: http://apt.intevation.de/dists/etch/unstable/source/kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz
Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
-# script used to generate Source0 above
+# script used to generate svn checkout Source0 above
Source1: kdepim-enterprise-svn_checkout.sh
-Release: 11.svn%{ent_date}.ent%{?dist}
+
+Release: 3.%{ent_date}svn.ent%{?dist}
%else
-Release: 11%{?dist}
+Release: 3%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
%endif
+
Source10: cr48-app-kandy.png
Source11: cr32-app-kandy.png
Source12: cr16-app-kandy.png
+Source20: crystalsvg-conflicts.txt
Patch1: kdepim-3.4.0-kandy-icons.patch
Patch2: kdepim-xdg_open.patch
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync@774532 \
+# svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API@774532 >kdepim-3.5.9-opensync03.patch
+Patch3: kdepim-3.5.9-opensync03.patch
+# http://websvn.kde.org/?view=rev&revision=775015
+# http://bugs.kde.org/show_bug.cgi?id=127696
+# Upstream fix for "Unable to complete LIST operation" errors with some servers,
+# just missed the 3.5.9 tagging.
+Patch4: kdepim-3.5.9-kde#127696.patch
## upstream patches
-# http://bugs.kde.org/146967 , http://bugzilla.redhat.com/352391
-Patch200: kdepim-3.5.7-kde#146967.patch
Provides: kdepim3 = %{version}-%{release}
@@ -63,10 +74,6 @@
BuildRequires: bison flex
BuildRequires: desktop-file-utils
BuildRequires: kdelibs3-devel >= %{version}
-## kmix (?)
-BuildRequires: kdemultimedia3
-## kttsd
-BuildRequires: kdeaccessibility
BuildRequires: zlib-devel
BuildRequires: libart_lgpl-devel
BuildRequires: cyrus-sasl-devel
@@ -145,15 +152,26 @@
%prep
-%setup -q %{?ent_date: -n %{name}}
+## Ugh 3 options, switch this by hand
+# stock upstream
+%setup -q
+# etch upstream sources
+#setup -q %{?etch_ver: -n kdepim-%{etch_ver}.enterprise.0.%{ent_date}.%{ent_rev}}
+# svn snapshot
+#setup -q -n kdepim
install -m644 -p %{SOURCE10} %{SOURCE11} %{SOURCE12} kandy/src/
%patch1 -p1 -b .kandy-icons
%patch2 -p1 -b .xdg_open
-# FIXME/TODO: patch doesn't apply, confirm whether it's still needed or not -- Rex
-#patch200 -p0 -b .kde#146967
+%if 0%{?fedora} > 8
+pushd kitchensync
+%patch3 -p0 -b .opensync03
+popd
+%endif
+
+%patch4 -p0 -b .kde127696
%if %{make_cvs}
make -f admin/Makefile.common cvs
@@ -198,7 +216,7 @@
popd
## remove references to extraneous/optional libraries in .la files (#170602)
-find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
+find %{buildroot}%{_libdir} -name "*.la" | xargs \
sed -i \
-e "s at -lpng@@g" \
-e "s@%{_libdir}/libqgpgme.la@@g" \
@@ -206,6 +224,14 @@
-e "s at -lgpgme@@g" \
-e "s at -lgpg-error@@g"
+%if 0%{?fedora} > 8
+# omit conflicts with kdeartwork-icons-crystalsvg
+# keep only: {kandy,kpilotDaemon}.png
+for icon in `cat %{SOURCE20}` ; do
+ rm -f %{buildroot}%{_datadir}/icons/crystalsvg/*/*/${icon}
+done
+%endif
+
%post
%{!?libs:/sbin/ldconfig}
@@ -258,6 +284,7 @@
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%{_docdir}/HTML/en/*
+%exclude %{_docdir}/HTML/en/kdepim*-apidocs
%if 0%{?libs}
%files libs
@@ -268,6 +295,7 @@
%files devel
%defattr(-,root,root,-)
+%{_docdir}/HTML/en/kdepim*-apidocs/
%{_includedir}/kde/*
%{_libdir}/lib*.so
%exclude %{_libdir}/libakregatorprivate.so
@@ -276,8 +304,33 @@
%changelog
-* Wed Jan 09 2008 Lukáš Tinkl <ltinkl at redhat.com> 6:3.5.8-11.20080109.ent
-- kdepim-enterprise branch 20080109 snapshot, r758806 (fixes #427974)
+* Fri Feb 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.9-3
+- backport upstream fix for kde#127696 from enterprise branch
+
+* Fri Feb 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.9-2
+- update opensync03 patch
+
+* Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-1
+- kde-3.5.9
+
+* Sat Feb 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.8-17.20080109.ent
+- rebuild for GCC 4.3
+
+* Mon Jan 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.8-16.20080109.ent
+- add patch from kitchensync-OpenSync0.30API branch to build KitchenSync again (F9+)
+
+* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-15.20080109.ent
+- 20080109 snapshot (sync with F-7/8 branches)
+
+* Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-14.20071204.ent
+- omit kpalmdoc.png icons too (f9+)
+
+* Fri Dec 28 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.8-13.20071204.ent
+- rebuild for new libopensync
+
+* Wed Dec 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-12.20071204.ent
+- omit crystalsvg icons (f9+)
+- kdepim_3.5.6.enterprise.0.20071204.744693
* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-10.20071129.ent
- kdepim-enterprise branch 20071129 snapshot, r742984
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources 9 Jan 2008 11:13:06 -0000 1.45
+++ sources 15 Feb 2008 22:20:36 -0000 1.46
@@ -1,5 +1,4 @@
024ab01d199f9e93c43df1ef0a03510c cr16-app-kandy.png
496c7bfc6247df2cf03aec342094ffd6 cr32-app-kandy.png
fef385691270bad1e58e6eb5ed0ad6d6 cr48-app-kandy.png
-e98af20c7fd60df48a4a1c692a7eb0e3 kdepim-enterprise-svn20071129.tar.bz2
-f1c8b673849a66865050c37dd7bb5feb kdepim-enterprise-svn20080109.tar.bz2
+ba27b06599556c572a26f03608471ee2 kdepim-3.5.9.tar.bz2
--- kdepim-3.5.7-kde#146967.patch DELETED ---
More information about the fedora-extras-commits
mailing list