rpms/kdepim/F-11 .cvsignore, 1.68, 1.69 kdepim.spec, 1.231, 1.232 sources, 1.76, 1.77

Rex Dieter rdieter at fedoraproject.org
Tue Jan 26 13:13:41 UTC 2010


Author: rdieter

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

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
- 4.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	29 Dec 2009 01:23:38 -0000	1.68
+++ .cvsignore	26 Jan 2010 13:13:41 -0000	1.69
@@ -1,2 +1 @@
-kdepim-4.3.3.tar.bz2
-kdepim-4.3.4.tar.bz2
+kdepim-4.3.5.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- kdepim.spec	29 Dec 2009 01:23:38 -0000	1.231
+++ kdepim.spec	26 Jan 2010 13:13:41 -0000	1.232
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.4
-Release: 2%{?dist}
+Version: 4.3.5
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -17,9 +17,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 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):
-Patch100: kdepim-4.3.4-monthview.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -98,7 +99,9 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-%patch100 -p4 -b .monthview
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+%patch2 -p1 -b .kmail_globalsettings_no_var_tracking
+%endif
 
 
 %build
@@ -219,6 +222,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
+- 4.3.5
+
 * Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-2
 - upstream korganizer monthview patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	5 Dec 2009 16:02:52 -0000	1.76
+++ sources	26 Jan 2010 13:13:41 -0000	1.77
@@ -1 +1 @@
-a4f32a268802be8eb852d1de00cbd2f6  kdepim-4.3.4.tar.bz2
+641721181c10c6d8ed229a7dd4b20ddf  kdepim-4.3.5.tar.bz2



More information about the scm-commits mailing list