rpms/kdepim/F-10 kdepim.spec, 1.209, 1.210 sources, 1.70, 1.71 kdepim-4.2.2-korganizer-crash.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909

Modified Files:
	kdepim.spec sources 
Removed Files:
	kdepim-4.2.2-korganizer-crash.patch 
Log Message:
respin



Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- kdepim.spec	6 Apr 2009 11:12:22 -0000	1.209
+++ kdepim.spec	5 May 2009 20:57:34 -0000	1.210
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.2.2
-Release: 3%{?dist}
+Version: 4.2.3
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -14,7 +14,6 @@ URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # 4.2 upstream patches
-Patch100: kdepim-4.2.2-korganizer-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,23 +30,22 @@ BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libassuan-devel
+BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
 # TODO: libmapi from http://www.openchange.org/
 #BuildRequires: libmapi-devel
 # Not used, has broken deps to boot -- Rex
 #BuildRequires: libopensync-devel
 BuildRequires: libxslt-devel
-BuildRequires: lockdev-devel
-%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12 libmal-devel >= 0.40}
+%if 0%{?_with_pilot_link:1}
+# libmal currently not used, recheck with kdepim-4.3
+#BuildRequirs: libmal-devel >= 0.40
+BuildRequires: pilot-link-devel >= 0.12
+%endif
 BuildRequires: python-devel
 BuildRequires: soprano-devel
 BuildRequires: qca2-devel
 BuildRequires: zlib-devel
-# these seem mostly bogus, not checked for, but linked nonetheless -- Rex
-BuildRequires: giflib-devel
-BuildRequires: openldap-devel
-BuildRequires: pcre-devel
-BuildRequires: libical-devel
 
 ##Optional bits
 Requires(hint): pinentry-gui
@@ -91,7 +89,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-%patch100 -p0 -b .crash
 
 %build
 mkdir -p %{_target_platform}
@@ -188,6 +185,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
+- 4.2.3
+
+* Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- drop extraneous BR's, including libmal-devel (not currently used)
+
 * Mon Apr 06 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - apply upstream patch to fix crash in korganizer
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	2 Apr 2009 15:10:25 -0000	1.70
+++ sources	5 May 2009 20:57:34 -0000	1.71
@@ -1 +1 @@
-964208d570845c75e0c482bb3d33892f  kdepim-4.2.2.tar.bz2
+94ad0eb531eb8ca03e3355ea9e2e90d6  kdepim-4.2.3.tar.bz2


--- kdepim-4.2.2-korganizer-crash.patch DELETED ---