rpms/kdepim/devel kdepim.spec,1.268,1.269

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3463

Modified Files:
	kdepim.spec 
Log Message:
* 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)



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- kdepim.spec	9 Feb 2010 14:56:27 -0000	1.268
+++ kdepim.spec	9 Feb 2010 18:40:59 -0000	1.269
@@ -3,7 +3,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -11,11 +11,8 @@ 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
 Patch100: kdepim-4.4.1-kontact-startup.patch
@@ -42,7 +39,6 @@ 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: libassuan-static, libassuan-devel
@@ -100,11 +96,7 @@ Obsoletes: kdepim-devel < 6:4.3.95-1
 
 %prep
 %setup -q -n kdepim-%{version}%{?alphatag}
-%patch0 -p1 -b .libqgpgme-link-fix
 %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
 
 
@@ -229,6 +221,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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