rpms/kdeedu/F-12 kdeedu-4.3.90-cantor_part_desktop_fix.patch, NONE, 1.1 .cvsignore, 1.74, 1.75 kdeedu.spec, 1.215, 1.216 sources, 1.75, 1.76 kdeedu-4.2.0-indi_nodrivers.patch, 1.1, NONE

Wed Feb 10 14:55:41 UTC 2010

Author: ltinkl

Update of /cvs/extras/rpms/kdeedu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16279/F-12

Modified Files:
	.cvsignore kdeedu.spec sources 
Added Files:
	kdeedu-4.3.90-cantor_part_desktop_fix.patch 
Removed Files:
	kdeedu-4.2.0-indi_nodrivers.patch 
Log Message:
KDE 4.4.0


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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-12/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	22 Jan 2010 19:58:30 -0000	1.74
+++ .cvsignore	10 Feb 2010 14:55:41 -0000	1.75
@@ -1 +1 @@
-kdeedu-4.3.5.tar.bz2
+kdeedu-4.4.0.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-12/kdeedu.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- kdeedu.spec	22 Jan 2010 19:58:30 -0000	1.215
+++ kdeedu.spec	10 Feb 2010 14:55:41 -0000	1.216
@@ -7,22 +7,23 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.5
+Version: 4.4.0
 Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdeedu-4.2.0-indi_nodrivers.patch
+## upstreamable patches
+Patch51: kdeedu-4.3.90-cantor_part_desktop_fix.patch 
 ## upstream patches
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
 
+BuildRequires: attica-devel
 # Kig can optionally use Boost.Python for Python scripting
 BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
@@ -40,6 +41,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
+BuildRequires: libspectre-devel
 BuildRequires: libusb-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
@@ -48,6 +50,7 @@ BuildRequires: ocaml(compiler)
 BuildRequires: ocaml-facile-devel
 %endif
 BuildRequires: python-devel python
+BuildRequires: R-devel
 BuildRequires: readline-devel
 
 ## BR's FIXME/TODO:
@@ -73,9 +76,13 @@ Requires: dustin-domestic-manners-fonts
 Requires: kross(python)
 Requires: python-mwclient
 
+Provides: plasma-dataengine-kalzium = %{version}-%{release}
+Provides: plasma-dataengine-parley = %{version}-%{release}
+
 %description
 Educational/Edutainment applications:
 * blinken: Simon Says Game
+* cantor: Frontend for math applications
 * kalzium: A periodic table of the elements
 * kanagram: Anagram game
 * kgeography: Learn geography
@@ -86,6 +93,7 @@ Educational/Edutainment applications:
 * kturtle: Logo Programming Environment
 * kwordquiz: Flashcard and vocabulary learning
 * parley: Vocabulary Trainer
+* rocs: Graph Theory IDE
 * step: Interactive physical simulator
 
 %package libs
@@ -165,9 +173,9 @@ Educational/Edutainment Math application
 
 
 %prep
-%setup -q -n kdeedu-%{version}
+%setup -q -n kdeedu-%{version}%{?alphatag}
 
-%patch1 -p1 -b .indi_nodrivers
+%patch51 -p1 -b .cantor_part_desktop_fix.patch
 
 
 %build
@@ -277,6 +285,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 # FIXME/TODO : sort file list into per-app sections. ? -- Rex
 %{_kde4_bindir}/blinken
+%{_kde4_bindir}/cantor
+%{_kde4_bindir}/cantor_rserver
 %{_kde4_bindir}/kalzium
 %{_kde4_bindir}/kanagram
 %{_kde4_bindir}/kgeography
@@ -289,12 +299,15 @@ rm -rf %{buildroot}
 %{_kde4_bindir}/kturtle
 %{_kde4_bindir}/kwordquiz
 %{_kde4_bindir}/parley
+%{_kde4_bindir}/rocs
 %{_kde4_bindir}/step
 %{_kde4_bindir}/tilecreator
 
 # FIXME?
 %{_kde4_appsdir}/desktoptheme/
 %{_kde4_appsdir}/blinken/
+%{_kde4_appsdir}/cantor/
+%{_kde4_appsdir}/cantorpart/
 %{_kde4_appsdir}/kalzium/
 %{_kde4_appsdir}/kanagram/
 %{_kde4_appsdir}/kgeography/
@@ -307,13 +320,22 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kvtml/
 %{_kde4_appsdir}/kwordquiz/
 %{_kde4_appsdir}/parley/
+%{_kde4_appsdir}/rocs/
 %{_kde4_appsdir}/step/
 
+%{_kde4_datadir}/kde4/services/cantor/
+%{_kde4_datadir}/kde4/services/cantor_part.desktop
+%{_kde4_datadir}/kde4/services/*Calculator.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop
 %{_kde4_datadir}/kde4/services/plasma_parley.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
 %{_kde4_datadir}/kde4/services/plasma_didyouknow.desktop
+%{_kde4_datadir}/kde4/servicetypes/cantor_*.desktop
 
+%{_kde4_libdir}/libcantor_config.so
+%{_kde4_libdir}/kde4/cantor_*.so
+%{_kde4_libdir}/kde4/libcantorpart.so
+%{_kde4_libdir}/kde4/*Calculator.so
 %{_kde4_libdir}/kde4/plasma_applet_parley.so
 %{_kde4_libdir}/kde4/plasma_engine_parley.so
 %{_kde4_libdir}/kde4/plasma_applet_didyouknow.so
@@ -323,6 +345,7 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/avogadro-kalzium/
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
+%{_kde4_datadir}/applications/kde4/cantor.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
 %{_kde4_datadir}/applications/kde4/kanagram.desktop
 %{_kde4_datadir}/applications/kde4/kgeography.desktop
@@ -333,9 +356,12 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/kturtle.desktop
 %{_kde4_datadir}/applications/kde4/kwordquiz.desktop
 %{_kde4_datadir}/applications/kde4/parley.desktop
+%{_kde4_datadir}/applications/kde4/rocs.desktop
 %{_kde4_datadir}/applications/kde4/step.desktop
 
 %{_kde4_datadir}/config.kcfg/blinken.kcfg
+%{_kde4_datadir}/config.kcfg/cantor.kcfg
+%{_kde4_datadir}/config.kcfg/cantor_libs.kcfg
 %{_kde4_datadir}/config.kcfg/documentsettings.kcfg
 %{_kde4_datadir}/config.kcfg/kalzium.kcfg
 %{_kde4_datadir}/config.kcfg/kanagram.kcfg
@@ -346,8 +372,17 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/ktouch.kcfg
 %{_kde4_datadir}/config.kcfg/kwordquiz.kcfg
 %{_kde4_datadir}/config.kcfg/languagesettings.kcfg
+%{_kde4_datadir}/config.kcfg/maximabackend.kcfg
 %{_kde4_datadir}/config.kcfg/parley.kcfg
+%{_kde4_datadir}/config.kcfg/rocs.kcfg
+%{_kde4_datadir}/config.kcfg/rserver.kcfg
+%{_kde4_datadir}/config.kcfg/sagebackend.kcfg
 %{_kde4_datadir}/config.kcfg/step.kcfg
+%{_kde4_configdir}/cantor.knsrc
+%{_kde4_configdir}/cantor_kalgebra.knsrc
+%{_kde4_configdir}/cantor_maxima.knsrc
+%{_kde4_configdir}/cantor_r.knsrc
+%{_kde4_configdir}/cantor_sage.knsrc
 %{_kde4_configdir}/kalzium.knsrc
 %{_kde4_configdir}/kanagram.knsrc
 %{_kde4_configdir}/khangman.knsrc
@@ -357,6 +392,7 @@ rm -rf %{buildroot}
 %{_kde4_configdir}/step.knsrc
 
 %{_kde4_docdir}/HTML/en/blinken/
+%{_kde4_docdir}/HTML/en/cantor/
 %{_kde4_docdir}/HTML/en/kalzium/
 %{_kde4_docdir}/HTML/en/kanagram/
 %{_kde4_docdir}/HTML/en/kgeography/
@@ -367,9 +403,11 @@ rm -rf %{buildroot}
 %{_kde4_docdir}/HTML/en/kturtle
 %{_kde4_docdir}/HTML/en/kwordquiz/
 %{_kde4_docdir}/HTML/en/parley/
+%{_kde4_docdir}/HTML/en/rocs/
 %{_kde4_docdir}/HTML/en/step/
 
 %{_kde4_iconsdir}/hicolor/*/*/blinken.*
+%{_kde4_iconsdir}/hicolor/*/*/cantor.*
 %{_kde4_iconsdir}/hicolor/*/*/kalzium.*
 %{_kde4_iconsdir}/hicolor/*/*/kanagram.*
 %{_kde4_iconsdir}/hicolor/*/*/kgeography.*
@@ -379,7 +417,11 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/*/*/ktouch.*
 %{_kde4_iconsdir}/hicolor/*/*/kturtle.*
 %{_kde4_iconsdir}/hicolor/*/*/kwordquiz.*
+%{_kde4_iconsdir}/hicolor/*/*/maximabackend.*
 %{_kde4_iconsdir}/hicolor/*/*/parley*.*
+%{_kde4_iconsdir}/hicolor/*/*/rbackend.*
+%{_kde4_iconsdir}/hicolor/*/*/rocs*.*
+%{_kde4_iconsdir}/hicolor/*/*/sagebackend.*
 %{_kde4_iconsdir}/hicolor/*/*/step.*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
@@ -391,7 +433,10 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/libkdeedu/
+%{_kde4_libdir}/libanalitzagui.so.4*
 %{_kde4_libdir}/libavogadro-kalzium.so.0*
+%{_kde4_libdir}/libcantorlibs.so.0*
+%{_kde4_libdir}/libcantorlibs.so.1
 %{_kde4_libdir}/libcompoundviewer.so.4*
 %{_kde4_libdir}/libkdeeduui.so.4*
 %{_kde4_libdir}/libkeduvocdocument.so.4*
@@ -405,6 +450,8 @@ rm -rf %{buildroot}
 %{_kde4_includedir}/libkdeedu/
 %{_kde4_includedir}/libkiten/
 %{_includedir}/marble/
+%{_kde4_libdir}/libanalitzagui.so
+%{_kde4_libdir}/libcantorlibs.so
 %{_kde4_libdir}/libkdeedu*.so
 %{_kde4_libdir}/libkeduvocdocument.so
 %{_kde4_libdir}/libkiten.so
@@ -488,11 +535,45 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
-- 4.3.5
+* Fri Feb 05 2010 Than Ngo <than at redhat.com> - 4.4.0-1
+- 4.4.0
+
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
+- KDE 4.3.98 (4.4rc3)
+
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.95-3
+- Provides: plasma-dataengine-{kalzium,parley}
+
+* Sat Jan 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.95-2
+- rebuild (libqalculate)
+
+* Wed Jan 20 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.3.95-1
+- KDE 4.3.95 (4.4rc2)
+
+* Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-3
+- rebuild (boost)
+
+* Fri Jan 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-2
+- drop indi_nodrivers patch (not needed anymore)
+
+* 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)
+
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
+* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
+- reenable ocaml-facile support (#546628)
+
+* Tue Dec 01 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+- temporarily disable ocaml-facile support due to #545116 (see #546628)
 
-* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
-- 4.3.4
+* Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
+- Update to 4.3.75 snapshot
 
 * Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-12/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	22 Jan 2010 19:58:30 -0000	1.75
+++ sources	10 Feb 2010 14:55:41 -0000	1.76
@@ -1 +1 @@
-5755742477a9db101c03269393ee36ad  kdeedu-4.3.5.tar.bz2
+ce6a1b694e881f12553b2409504b8694  kdeedu-4.4.0.tar.bz2


--- kdeedu-4.2.0-indi_nodrivers.patch DELETED ---

