rpms/kdepim/FC-5 kdepim-3.5.3-kmail-127538.patch, NONE, 1.1 kdepim-3.5.3-kmail-encryption.patch, NONE, 1.1 kdepim-3.5.3-kmail-typo.patch, NONE, 1.1 kdepim-3.5.3-korganizer.patch, NONE, 1.1 kdepim.spec, 1.84, 1.85
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jun 9 15:23:56 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22412
Modified Files:
kdepim.spec
Added Files:
kdepim-3.5.3-kmail-127538.patch
kdepim-3.5.3-kmail-encryption.patch
kdepim-3.5.3-kmail-typo.patch kdepim-3.5.3-korganizer.patch
Log Message:
add some upstream patches
kdepim-3.5.3-kmail-127538.patch:
kmcomposewin.cpp | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE kdepim-3.5.3-kmail-127538.patch ---
--- kdepim-3.5.3/kmail/kmcomposewin.cpp.orig 2006-06-09 17:01:50.000000000 +0200
+++ kdepim-3.5.3/kmail/kmcomposewin.cpp 2006-06-09 17:20:20.000000000 +0200
@@ -667,6 +667,8 @@
KConfigGroupSaver saver( KMKernel::config(), "Geometry" );
saveMainWindowSettings( KMKernel::config(), "Composer" );
+ // make sure config changes are written to disk, cf. bug 127538
+ GlobalSettings::self()->writeConfig();
}
//-----------------------------------------------------------------------------
kdepim-3.5.3-kmail-encryption.patch:
partmetadata.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE kdepim-3.5.3-kmail-encryption.patch ---
--- kdepim-3.5.3/kmail/partmetadata.h.orig 2006-06-09 17:08:26.000000000 +0200
+++ kdepim-3.5.3/kmail/partmetadata.h 2006-06-09 17:08:32.000000000 +0200
@@ -35,7 +35,12 @@
isEncrypted( false ),
isDecryptable( false ),
technicalProblem( false ),
- isEncapsulatedRfc822Message( false ) {}
+ isEncapsulatedRfc822Message( false )
+ {
+ creationTime.tm_year = 0;
+ creationTime.tm_mon = 1;
+ creationTime.tm_mday = 1;
+ }
bool isSigned;
bool isGoodSignature;
CryptPlugWrapper::SigStatusFlags sigStatusFlags;
kdepim-3.5.3-kmail-typo.patch:
kmcomposewin.cpp | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdepim-3.5.3-kmail-typo.patch ---
--- kdepim-3.5.3/kmail/kmcomposewin.cpp.orig 2006-06-09 17:01:50.000000000 +0200
+++ kdepim-3.5.3/kmail/kmcomposewin.cpp 2006-05-22 20:10:53.000000000 +0200
@@ -4021,7 +4021,7 @@
}
// Squeeze tabs and spaces
- QRegExp squeeze( "[\t ]+" );
+ QRegExp squeeze( "[\t, ]+" );
s.replace( squeeze, QChar( ' ' ) );
// Remove trailing whitespace
kdepim-3.5.3-korganizer.patch:
kogroupware.cpp | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdepim-3.5.3-korganizer.patch ---
--- kdepim-3.5.3/korganizer/kogroupware.cpp.orig 2006-06-09 16:48:47.000000000 +0200
+++ kdepim-3.5.3/korganizer/kogroupware.cpp 2006-06-09 16:54:47.000000000 +0200
@@ -263,7 +263,7 @@
"with the organizers calendar. Do you really want "
"to edit it?" );
rc = KMessageBox::warningYesNo( parent, txt );
- return ( rc == KMessageBox::Continue );
+ return ( rc == KMessageBox::Yes );
}
} else {
kdWarning(5850) << "Groupware messages for Journals are not implemented yet!" << endl;
Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kdepim.spec 9 Jun 2006 14:43:45 -0000 1.84
+++ kdepim.spec 9 Jun 2006 15:23:53 -0000 1.85
@@ -31,6 +31,12 @@
Patch3: kdepim-3.4.0-kandy-icons.patch
Patch4: kdepim-3.4.92-libz.patch
+# upstream patches
+Patch100: kdepim-3.5.3-korganizer.patch
+Patch101: kdepim-3.5.3-kmail-typo.patch
+Patch102: kdepim-3.5.3-kmail-encryption.patch
+Patch103: kdepim-3.5.3-kmail-127538.patch
+
Requires: kdebase >= %{kdebase_epoch}:%{version}
Requires(post,postun): /sbin/ldconfig
@@ -112,6 +118,12 @@
%patch3 -p1 -b .kandy-icons
%patch4 -p1 -b .libz
+# upstream patches
+%patch100 -p1 -b .korganizer-kogroupware
+%patch101 -p1 -b .kmail-typo
+%patch102 -p1 -b .kmail-encryption
+%patch103 -p1 -b .kmail-127538.patch
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
FLAGS="%{optflags}"
More information about the fedora-cvs-commits
mailing list