rpms/kdepim/devel .cvsignore, 1.34, 1.35 kdepim.spec, 1.123, 1.124 sources, 1.39, 1.40 kdepim-3.5.6-kde#140207.patch, 1.1, NONE kdepim-3.5.6-kmail-imap.patch, 1.1, NONE kdepim-3.5.6-kmail-kde#140660.patch, 1.1, NONE kdepim-3.5.6-kmail-templates.patch, 1.1, NONE kdepim-3.5.6-security.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22790

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-3.5.6-kde#140207.patch kdepim-3.5.6-kmail-imap.patch 
	kdepim-3.5.6-kmail-kde#140660.patch 
	kdepim-3.5.6-kmail-templates.patch kdepim-3.5.6-security.patch 
Log Message:
* Wed Jun 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
- +BR: libopensync-devel

* Wed Jun 13 2007 Than Ngo <than at redhat.com> - 6:3.5.7-1.fc7
- bump release version

* Wed Jun 06 2007 Than Ngo <than at redhat.com> -  6:3.5.7-0.1.fc7
- 3.5.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	5 Apr 2007 14:15:53 -0000	1.34
+++ .cvsignore	16 Jun 2007 19:14:32 -0000	1.35
@@ -13,3 +13,4 @@
 kdepim-3.5.3.tar.bz2
 kdepim-3.5.4.tar.bz2
 timezone-update.diff.bz2
+kdepim-3.5.7.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdepim.spec	11 May 2007 00:09:42 -0000	1.123
+++ kdepim.spec	16 Jun 2007 19:14:32 -0000	1.124
@@ -11,8 +11,8 @@
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
-Version: 3.5.6
-Release: 7%{?dist}
+Version: 3.5.7
+Release: 2%{?dist}
 
 Group: Applications/Productivity
 License: GPL
@@ -28,14 +28,6 @@
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
 
-# upstream fixes
-Patch1000: kdepim-3.5.6-kde#140207.patch
-Patch1001: kdepim-3.5.6-kmail-kde#140660.patch
-Patch1002: kdepim-3.5.6-kmail-templates.patch
-Patch1003: kdepim-3.5.6-security.patch
-Patch1004: kdepim-3.5.6-kmail-imap.patch
-Patch1005: timezone-update.diff.bz2
-
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -66,6 +58,9 @@
 %if 0%{?fedora} > 4  || 0%{?rhel} > 4
 BuildRequires: libXpm-devel libXScrnSaver-devel
 %endif
+%if 0%{?fedora} > 5
+BuildRequires: libopensync-devel
+%endif
 %if %{make_cvs}
 BuildRequires: automake libtool
 %endif
@@ -101,16 +96,6 @@
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
 
-%ifnarch s390 s390x
-%patch1000 -p1 -b .kde#140207
-%endif
-
-%patch1001 -p1 -b .kde#140660
-%patch1002 -p1 -b .kmail-templates
-%patch1003 -p0 -b .security
-%patch1004 -p0 -b .imap
-%patch1005 -p0 -b .timezone
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -198,13 +183,8 @@
 %{_bindir}/*
 %{_libdir}/lib*.so.*
 %{_libdir}/libakregatorprivate.so
-%{_libdir}/libkabckonnector.so
-%{_libdir}/libkcalkonnector.so
 %{_libdir}/libkmailprivate.so
 %{_libdir}/libknodecommon.so
-%{_libdir}/liblocalkonnector.so
-%{_libdir}/libqtopiakonnector.so
-%{_libdir}/libremotekonnector.so
 %{_libdir}/lib*.la
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin/*
@@ -227,15 +207,19 @@
 %{_includedir}/kde/*
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libakregatorprivate.so
-%exclude %{_libdir}/libkabckonnector.so
-%exclude %{_libdir}/libkcalkonnector.so
 %exclude %{_libdir}/libkmailprivate.so
 %exclude %{_libdir}/libknodecommon.so
-%exclude %{_libdir}/liblocalkonnector.so
-%exclude %{_libdir}/libqtopiakonnector.so
-%exclude %{_libdir}/libremotekonnector.so
 
 %changelog
+* Wed Jun 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
+- +BR: libopensync-devel
+
+* Wed Jun 13 2007 Than Ngo <than at redhat.com> - 6:3.5.7-1.fc7
+- bump release version
+
+* Wed Jun 06 2007 Than Ngo <than at redhat.com> -  6:3.5.7-0.1.fc7
+- 3.5.7
+
 * Thu May 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.6-7
 - +BR: gpgme-devel gnokii-devel libmal-devel
 - +Requires: pinentry-gui


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	5 Apr 2007 14:15:53 -0000	1.39
+++ sources	16 Jun 2007 19:14:32 -0000	1.40
@@ -1,2 +1 @@
-e37e6173fe9fd7f242c9502a4ae1d7de  kdepim-3.5.6.tar.bz2
-263a717b397df1acd01a8b2c08546bcd  timezone-update.diff.bz2
+8571db6dcf4168614c96bb72c493f931  kdepim-3.5.7.tar.bz2


--- kdepim-3.5.6-kde#140207.patch DELETED ---


--- kdepim-3.5.6-kmail-imap.patch DELETED ---


--- kdepim-3.5.6-kmail-kde#140660.patch DELETED ---


--- kdepim-3.5.6-kmail-templates.patch DELETED ---


--- kdepim-3.5.6-security.patch DELETED ---