packages (DEVEL): kde4-kdepim-runtime/kde4-kdepim-runtime.spec, kde4-kdepim...

[arekm]

Author: arekm                        Date: Fri Feb 12 07:59:41 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- rel 2; branch diff

---- Files affected:
packages/kde4-kdepim-runtime:
   kde4-kdepim-runtime.spec (1.8.2.15 -> 1.8.2.16) , kde4-kdepim-runtime-branch.diff (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec
diff -u packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec:1.8.2.15 packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec:1.8.2.16
--- packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec:1.8.2.15	Thu Feb  4 21:43:23 2010
+++ packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec	Fri Feb 12 08:59:35 2010
@@ -9,12 +9,12 @@
 Summary(pl.UTF-8):	Zarządca informacji osobistej (PIM) dla KDE
 Name:		kde4-kdepim-runtime
 Version:	4.4.0
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
 # Source0-md5:	ff023837a749cceac1f83c291dbe2ff0
-#Patch100: %{name}-branch.diff
+Patch100: %{name}-branch.diff
 URL:		http://www.kde.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtDesigner-devel >= %{qtver}
@@ -89,7 +89,7 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
-#%patch100 -p0
+%patch100 -p1
 
 %build
 install -d build
@@ -237,6 +237,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8.2.16  2010/02/12 07:59:35  arekm
+- rel 2; branch diff
+
 Revision 1.8.2.15  2010/02/04 20:43:23  arekm
 - up to 4.4.0
 

================================================================
Index: packages/kde4-kdepim-runtime/kde4-kdepim-runtime-branch.diff
diff -u /dev/null packages/kde4-kdepim-runtime/kde4-kdepim-runtime-branch.diff:1.1.2.1
--- /dev/null	Fri Feb 12 08:59:41 2010
+++ packages/kde4-kdepim-runtime/kde4-kdepim-runtime-branch.diff	Fri Feb 12 08:59:35 2010
@@ -0,0 +1,48 @@
+--- runtime/resources/pop3/accountdialog.cpp	(.../tags/KDE/4.4.0/kdepim)	(wersja 1089014)
++++ runtime/resources/pop3/accountdialog.cpp	(.../branches/KDE/4.4/kdepim)	(wersja 1089014)
+@@ -245,7 +245,6 @@
+     connect ( requestJob, SIGNAL(result(KJob*)),
+               this, SLOT(localFolderRequestJobFinished(KJob*)) );
+   }
+-  folderRequester->setEnabled( false );
+ 
+   if ( Settings::storePassword() ) {
+     mWallet = Wallet::openWallet( Wallet::NetworkWallet(), winId(),
+@@ -673,7 +672,6 @@
+ void AccountDialog::targetCollectionReceived( Akonadi::Collection::List collections )
+ {
+   folderRequester->setCollection( collections.first() );
+-  folderRequester->setEnabled( true );
+ }
+ 
+ void AccountDialog::localFolderRequestJobFinished( KJob *job )
+@@ -683,7 +681,6 @@
+     Q_ASSERT( targetCollection.isValid() );
+     folderRequester->setCollection( targetCollection );
+   }
+-  folderRequester->setEnabled( true );
+ }
+ 
+ #include "accountdialog.moc"
+--- runtime/resources/maildir/maildirresource.cpp	(.../tags/KDE/4.4.0/kdepim)	(wersja 1089014)
++++ runtime/resources/maildir/maildirresource.cpp	(.../branches/KDE/4.4/kdepim)	(wersja 1089014)
+@@ -346,7 +346,7 @@
+ {
+   kDebug() << collection << source << dest;
+   if ( collection.parentCollection() == Collection::root() ) {
+-    emit error( i18n( "Cannot move root maildir folder '%1'." ).arg( collection.remoteId() ) );
++    emit error( i18n( "Cannot move root maildir folder '%1'." ,collection.remoteId() ) );
+     changeProcessed();
+     return;
+   }
+--- runtime/resources/kabc/kresourceassistant.cpp	(.../tags/KDE/4.4.0/kdepim)	(wersja 1089014)
++++ runtime/resources/kabc/kresourceassistant.cpp	(.../branches/KDE/4.4/kdepim)	(wersja 1089014)
+@@ -370,7 +370,7 @@
+     d->mConfigWidget->loadSettings( d->mCreationWidget->mResource );
+   } else if ( item->widget() == d->mConfigWidget ) {
+     d->mConfigWidget->saveSettings( d->mCreationWidget->mResource );
+-
++    d->setReadOnly( d->mCreationWidget->mResource->readOnly() );
+     const QString resourceName = d->mCreationWidget->mResource->resourceName();
+     d->mFolderWidget->mName->setText( resourceName );
+   }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec?r1=1.8.2.15&r2=1.8.2.16&f=u