rpms/kdepim/devel kdepim.spec,1.251,1.252

[Lorenzo Villani]

Author: arbiter

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

Modified Files:
	kdepim.spec 
Log Message:
* Fri Dec 11 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.3.80-5
- KPilot is no longer part of kdepim
  (see http://bertjan.broeksemaatjes.nl/node/50)



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- kdepim.spec	9 Dec 2009 15:19:58 -0000	1.251
+++ kdepim.spec	11 Dec 2009 15:39:27 -0000	1.252
@@ -1,12 +1,8 @@
-%ifnarch s390 s390x
-%define _with_pilot_link 1
-%endif
-
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.80
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -18,7 +14,7 @@ Patch0:  kdepim-4.1.80-libqgpgme-link-fi
 # 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 
+Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch
 Patch3:  kdepim-4.3.75-desktop-fixes.patch
 
 # upstream patches (4.4 branch):
@@ -51,11 +47,6 @@ BuildRequires: libXpm-devel libXScrnSave
 # Not used, has broken deps to boot -- Rex
 #BuildRequires: libopensync-devel
 BuildRequires: libxslt-devel
-%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
@@ -77,7 +68,7 @@ Requires(hint): spambayes
 * knotes: sticky notes for the desktop
 * kontact: integrated PIM management
 * korganizer: journal, appointments, events, todos
-%{?_with_pilot_link:* kpilot: HotSync® software for Palm OS® devices}
+
 
 %package devel
 Summary: Development files for %{name}
@@ -171,9 +162,6 @@ rm -rf %{buildroot}
 %doc README README.Kolab
 %doc COPYING
 %{_kde4_bindir}/*
-%if 0%{?_with_pilot_link:1}
-%{_kde4_libdir}/libkpilot_*.so
-%endif
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
 %{_kde4_datadir}/akonadi/agents/*.desktop
@@ -196,9 +184,6 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kontactsummary/
 %{_kde4_appsdir}/korgac/
 %{_kde4_appsdir}/korganizer/
-%if 0%{?_with_pilot_link:1}
-%{_kde4_appsdir}/kpilot/
-%endif
 %{_kde4_appsdir}/ktimetracker/
 %{_kde4_appsdir}/kwatchgnupg/
 %{_kde4_appsdir}/libkdepim/
@@ -223,12 +208,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%if 0%{?_with_pilot_link:1}
-%exclude %{_kde4_libdir}/libkpilot_*.so
-%endif
 
 
 %changelog
+* Fri Dec 11 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.3.80-5
+- KPilot is no longer part of kdepim
+  (see http://bertjan.broeksemaatjes.nl/node/50)
+
 * Wed Dec 09 2009 Than Ngo <than at redhat.com> - 4.3.80-4
 - apply upstream patch to fix crash in Kontact+KOrganizer with Qt4.6
 
@@ -302,7 +288,7 @@ rm -rf %{buildroot}
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
-- 4.3rc3 
+- 4.3rc3
 
 * Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
 - 4.3rc2