Thu Oct 26 18:44:28 UTC 2006

Author: than

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

Modified Files:
	kdepim.spec sources 
Removed Files:
	kde-libtool.patch kdepim-3.5.3-gcc-4.1.1-8.patch 
	kdepim-3.5.4-akregator-font.patch 
	kdepim-3.5.4-holidays-es.patch kdepim-3.5.4-kde#116607.patch 
	kdepim-3.5.4-kde#117882.patch kdepim-3.5.4-kde#126060.patch 
	kdepim-3.5.4-kde#126975.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#134200.patch 
	kdepim-3.5.4-kde#134702.patch kdepim-3.5.4-kde#98545.patch 
Log Message:
3.5.5



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-6/kdepim.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110

--- kdepim.spec	27 Sep 2006 13:46:06 -0000	1.109
+++ kdepim.spec	26 Oct 2006 18:44:26 -0000	1.110
@@ -3,15 +3,14 @@
 
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
-%define qt_version 1:3.3.6
-%define arts_version 8:1.5.4
-%define arts 1
-%define make_cvs 1
+%define qt_version 1:3.3.7
+%define arts_version 8:1.5.5
+%define make_cvs 0
 
 %define appdir %{_datadir}/applications/kde
 
-Version: 3.5.4
-Release: 5%{?dist}
+Version: 3.5.5
+Release: 0.1%{?dist}
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -20,31 +19,14 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.kde.org
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: cr48-app-kandy.png
 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
-Patch5: kdepim-3.5.3-gcc-4.1.1-8.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
-Patch107: kdepim-3.5.4-akregator-font.patch
-Patch108: kdepim-3.5.4-holidays-es.patch
-Patch109: kdepim-3.5.4-kde#134200.patch
-Patch110: kdepim-3.5.4-kde#126975.patch
-Patch111: kdepim-3.5.4-kde#134702.patch
-Patch112: kdepim-3.5.4-kde#126060.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -55,23 +37,22 @@
 BuildRequires: flex
 BuildRequires: desktop-file-utils
 BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: zlib-devel
+BuildRequires: libart_lgpl-devel
 BuildRequires: audiofile-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: lockdev-devel
 BuildRequires: python-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXScrnSaver-devel
-%if %{arts}
 BuildRequires: arts-devel >= %{arts_version}
-%endif
 %ifnarch s390 s390x
 BuildRequires: bluez-libs-devel
 BuildRequires: pilot-link-devel >= 0.11
 %endif
-%if %{make_cvs}
 BuildRequires: autoconf
 BuildRequires: automake
-%endif
+BuildRequires: libtool
 
 %description
 A PIM (Personal Information Manager) for KDE.
@@ -98,21 +79,6 @@
 %patch4 -p1 -b .libz
 %patch5 -p1 -b .gcc-4.1.1-8
 
-# 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
-%patch107 -p0 -b .akregator-font
-%patch108 -p0 -b .holidays-es
-%patch109 -p0 -b .kde#134200
-%patch110 -p0 -b .kde#126975
-%patch111 -p0 -b .kde#134702
-%patch112 -p0 -b .kde#126060
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -127,9 +93,6 @@
    --disable-dependency-tracking \
    --disable-rpath \
    --disable-gcc-hidden-visibility \
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -186,8 +149,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/*
@@ -196,7 +167,7 @@
 %{_datadir}/applnk/Utilities
 %{_datadir}/apps/*
 %{_datadir}/autostart/*
-%config %{_datadir}/config/*
+%config(noreplace) %{_datadir}/config/*
 %{_datadir}/config.kcfg/*
 %doc %{_docdir}/HTML/en/*
 %{_datadir}/icons/*/*/*/*
@@ -207,8 +178,20 @@
 %files devel
 %defattr(-,root,root)
 %{_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
+* Thu Oct 26 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.1
+- 3.5.5
+
 * Thu Sep 14 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
 - apply upstream patches
    fix 98545, kmail does not remember pop3 passwords


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-6/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	10 Aug 2006 15:20:37 -0000	1.36
+++ sources	26 Oct 2006 18:44:26 -0000	1.37
@@ -1 +1 @@
-4a01ceaeb6067d03003edb77b104f559  kdepim-3.5.4.tar.bz2
+3f2127f74cb496899bb3f1f6f702353b  kdepim-3.5.5.tar.bz2


--- kde-libtool.patch DELETED ---


--- kdepim-3.5.3-gcc-4.1.1-8.patch DELETED ---


--- kdepim-3.5.4-akregator-font.patch DELETED ---


--- kdepim-3.5.4-holidays-es.patch DELETED ---


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


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


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


--- kdepim-3.5.4-kde#126975.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#134200.patch DELETED ---


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


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


