rpms/kdepim/devel kdepim-4.3.85-dt_validate.patch, NONE, 1.1 kdepim.spec, 1.260, 1.261 kdepim-4.3.75-desktop-fixes.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.85-dt_validate.patch 
Removed Files:
	kdepim-4.3.75-desktop-fixes.patch 
Log Message:
* Thu Dec 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-4
- dt_validate patch


kdepim-4.3.85-dt_validate.patch:
 kontact-admin.desktop |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdepim-4.3.85-dt_validate.patch ---
diff -up kdepim-4.3.85/doc/kontact-admin/kontact-admin.desktop.dt_validate kdepim-4.3.85/doc/kontact-admin/kontact-admin.desktop
--- kdepim-4.3.85/doc/kontact-admin/kontact-admin.desktop.dt_validate	2009-12-14 04:54:47.000000000 -0600
+++ kdepim-4.3.85/doc/kontact-admin/kontact-admin.desktop	2009-12-31 13:53:38.888390711 -0600
@@ -24,3 +24,4 @@ Categories=Qt;KDE;Office;ProjectManageme
 X-DocPath=kontact-admin/index.html
 NoDisplay=true
 Terminal=false
+Type=Application


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- kdepim.spec	27 Dec 2009 14:38:08 -0000	1.260
+++ kdepim.spec	31 Dec 2009 19:58:46 -0000	1.261
@@ -3,7 +3,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.85
-Release: 3%{?dist}.1
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -16,11 +16,9 @@ Patch0:  kdepim-4.1.80-libqgpgme-link-fi
 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
-Patch3:  kdepim-4.3.75-desktop-fixes.patch
 
-# upstream patches (4.4 branch):
-
-# upstream patches (trunk)
+# upstream patches
+Patch100: kdepim-4.3.85-dt_validate.patch
 
 Obsoletes: bilbo < 1:1.0
 %if 0%{?fedora} < 13
@@ -104,7 +102,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
 %patch2 -p1 -b .kmail_globalsettings_no_var_tracking
 %endif
-%patch3 -p1 -b .desktop-fixes
+%patch100 -p1 -b .dt_validate
 
 
 %build
@@ -199,13 +197,13 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/libkdepim/
 %{_kde4_appsdir}/libkleopatra/
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/autostart/*.desktop
 %{_kde4_datadir}/config/*rc
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_docdir}/HTML/en/*
 %{_mandir}/man*/*.gz
 
@@ -221,6 +219,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-4
+- dt_validate patch
+
 * Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-3.1
 - Requires: kpilot for upgrade path (F12-)
 


--- kdepim-4.3.75-desktop-fixes.patch DELETED ---