rpms/kdeedu/devel kdeedu-4.3.90-cantor_part_desktop_fix.patch, NONE, 1.1 kdeedu.spec, 1.222, 1.223 kdeedu-4.3.75-desktop-fix.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.3.90-cantor_part_desktop_fix.patch 
Removed Files:
	kdeedu-4.3.75-desktop-fix.patch 
Log Message:
* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
- kde-4.3.90 (4.4rc1)


kdeedu-4.3.90-cantor_part_desktop_fix.patch:
 CMakeLists.txt      |    2 +-
 cantor_part.desktop |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdeedu-4.3.90-cantor_part_desktop_fix.patch ---
diff -up kdeedu-4.3.90/cantor/src/cantor_part.desktop.desktop-fix kdeedu-4.3.90/cantor/src/cantor_part.desktop
--- kdeedu-4.3.90/cantor/src/cantor_part.desktop.desktop-fix	2009-12-31 07:28:37.000000000 -0600
+++ kdeedu-4.3.90/cantor/src/cantor_part.desktop	2010-01-06 22:02:10.406610853 -0600
@@ -17,7 +17,7 @@ Name[uk]=CantorPart
 Name[x-test]=xxCantorPartxx
 Name[zh_CN]=Cantor 组件
 Name[zh_TW]=Cantor 部件
-MimeType=application/x-cantor
+MimeType=application/x-cantor;
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-KDE-Library=libcantorpart
 Type=Service
diff -up kdeedu-4.3.90/cantor/src/CMakeLists.txt.desktop-fix kdeedu-4.3.90/cantor/src/CMakeLists.txt
--- kdeedu-4.3.90/cantor/src/CMakeLists.txt.desktop-fix	2009-12-10 17:14:14.000000000 -0600
+++ kdeedu-4.3.90/cantor/src/CMakeLists.txt	2010-01-06 22:00:27.662847347 -0600
@@ -68,7 +68,7 @@ if(LIBSPECTRE_FOUND)
    target_link_libraries(cantorpart ${LIBSPECTRE_LIBRARY})
 endif(LIBSPECTRE_FOUND)
 
-install( FILES cantor_part.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES cantor_part.desktop  DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES cantor_part.rc  DESTINATION  ${DATA_INSTALL_DIR}/cantorpart )
 
 install(TARGETS cantorpart  DESTINATION ${PLUGIN_INSTALL_DIR} )


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- kdeedu.spec	30 Dec 2009 21:57:06 -0000	1.222
+++ kdeedu.spec	7 Jan 2010 04:05:47 -0000	1.223
@@ -7,8 +7,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.85
-Release: 2%{?dist}
+Version: 4.3.90
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -16,8 +16,9 @@ URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdeedu-4.2.0-indi_nodrivers.patch
-Patch2: kdeedu-4.3.75-desktop-fix.patch
+## upstreamable patches
+Patch50: kdeedu-4.2.0-indi_nodrivers.patch
+Patch51: kdeedu-4.3.90-cantor_part_desktop_fix.patch 
 ## upstream patches
 
 Obsoletes: kdeedu4 < %{version}-%{release}
@@ -172,8 +173,8 @@ Educational/Edutainment Math application
 %prep
 %setup -q -n kdeedu-%{version}%{?alphatag}
 
-%patch1 -p1 -b .indi_nodrivers
-%patch2 -p1 -b .desktop-fix
+%patch50 -p1 -b .indi_nodrivers
+%patch51 -p1 -b .cantor_part_desktop_fix.patch
 
 
 %build
@@ -529,6 +530,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- kde-4.3.90 (4.4rc1)
+
 * Wed Dec 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
 - rebuild for new OCaml (3.11.2 rc1)
 


--- kdeedu-4.3.75-desktop-fix.patch DELETED ---