rpms/kdepim/FC-5 .cvsignore, 1.31, 1.32 kdepim.spec, 1.92, 1.93 sources, 1.36, 1.37 kdepim-3.5.4-kde#116607.patch, 1.1, NONE kdepim-3.5.4-kde#117882.patch, 1.1, NONE kdepim-3.5.4-kde#131067.patch, 1.1, NONE kdepim-3.5.4-kde#132008.patch, 1.1, NONE kdepim-3.5.4-kde#133792.patch, 1.1, NONE kdepim-3.5.4-kde#133846.patch, 1.1, NONE kdepim-3.5.4-kde#98545.patch, 1.1, NONE

Tue Oct 17 10:16:53 UTC 2006

Author: than

Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8614

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-3.5.4-kde#116607.patch kdepim-3.5.4-kde#117882.patch 
	kdepim-3.5.4-kde#131067.patch kdepim-3.5.4-kde#132008.patch 
	kdepim-3.5.4-kde#133792.patch kdepim-3.5.4-kde#133846.patch 
	kdepim-3.5.4-kde#98545.patch 
Log Message:
update to 3.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32

--- .cvsignore	9 Jun 2006 14:43:45 -0000	1.31
+++ .cvsignore	17 Oct 2006 10:16:51 -0000	1.32
@@ -10,3 +10,4 @@
 kdepim-3.5.0.tar.bz2
 kdepim-3.5.1.tar.bz2
 kdepim-3.5.3.tar.bz2
+kdepim-3.5.5.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kdepim.spec	18 Sep 2006 14:23:21 -0000	1.92
+++ kdepim.spec	17 Oct 2006 10:16:51 -0000	1.93
@@ -4,11 +4,11 @@
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_version 1:3.3.6
-%define arts_version 8:1.5.4
+%define arts_version 8:1.5.5
 %define make_cvs 1
 
-Version: 3.5.4
-Release: 0.2.fc5
+Version: 3.5.5
+Release: 0.1.fc5
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -22,20 +22,10 @@
 Source2: cr32-app-kandy.png
 Source3: cr16-app-kandy.png
 
-Patch1: kde-libtool.patch
 Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
 
-# upstream patches
-Patch100: kdepim-3.5.4-kde#132008.patch
-Patch101: kdepim-3.5.4-kde#117882.patch
-Patch102: kdepim-3.5.4-kde#131067.patch
-Patch103: kdepim-3.5.4-kde#116607.patch
-Patch104: kdepim-3.5.4-kde#133846.patch
-Patch105: kdepim-3.5.4-kde#98545.patch
-Patch106: kdepim-3.5.4-kde#133792.patch
-
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -50,6 +40,7 @@
 BuildRequires: audiofile-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: lockdev-devel
+BuildRequires: python-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: python-devel
@@ -77,7 +68,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .libtool
 
 %ifarch s390 s390x
 %patch2 -p1 -b .s390
@@ -87,15 +77,6 @@
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
 
-# upstream patches
-%patch100 -p0 -b .kde#132008
-%patch101 -p0 -b .kde#117882
-%patch102 -p0 -b .kde#131067
-%patch103 -p0 -b .kde#116607
-%patch104 -p0 -b .kde#133846
-%patch105 -p0 -b .kde#98545
-%patch106 -p0 -b .kde#133792
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -120,7 +101,7 @@
    --includedir=%{_includedir}/kde \
    --with-sasl \
    --with-gpg=%{_bindir}/gpg \
-   --with-gpgsm=%{_bindir}/gpgsm \
+   --with-gpgsm=%{_bindir}/gpgsm
 
 make %{?_smp_mflags}
 
@@ -166,8 +147,16 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/*
-%{_libdir}/*.so*
-%{_libdir}/*.la
+%{_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/*
 %{_datadir}/applications/kde/*
@@ -176,7 +165,7 @@
 %{_datadir}/applnk/Utilities
 %{_datadir}/apps/*
 %{_datadir}/autostart/*
-%config %{_datadir}/config/*
+%config(noreplace) %{_datadir}/config/*
 %{_datadir}/config.kcfg/*
 %doc %{_docdir}/HTML/en/*
 %{_datadir}/icons/*/*/*/*
@@ -186,9 +175,21 @@
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/lib*.so
 %{_includedir}/kde/*
+%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
+* Tue Oct 17 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.1.fc5
+- update to 3.5.5
+
 * Mon Sep 18 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.2.fc5
 - apply upstream patches
     fix #98545, kmail does not remember pop3 passwords


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	11 Aug 2006 18:43:23 -0000	1.36
+++ sources	17 Oct 2006 10:16:51 -0000	1.37
@@ -1 +1 @@
-4a01ceaeb6067d03003edb77b104f559  kdepim-3.5.4.tar.bz2
+3f2127f74cb496899bb3f1f6f702353b  kdepim-3.5.5.tar.bz2


--- kdepim-3.5.4-kde#116607.patch DELETED ---


--- kdepim-3.5.4-kde#117882.patch DELETED ---


--- kdepim-3.5.4-kde#131067.patch DELETED ---


--- kdepim-3.5.4-kde#132008.patch DELETED ---


--- kdepim-3.5.4-kde#133792.patch DELETED ---


--- kdepim-3.5.4-kde#133846.patch DELETED ---


--- kdepim-3.5.4-kde#98545.patch DELETED ---


