diff --git a/.cvsignore b/.cvsignore index 1b55217..18cc2ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdeedu-4.3.3.tar.bz2 +kdeedu-4.3.75svn1048496.tar.bz2 diff --git a/kdeedu-4.3.75-desktop-fix.patch b/kdeedu-4.3.75-desktop-fix.patch new file mode 100644 index 0000000..318c46d --- /dev/null +++ b/kdeedu-4.3.75-desktop-fix.patch @@ -0,0 +1,28 @@ +diff -r -U5 kdeedu-4.3.75svn1048496/cantor/src/cantor_part.desktop kdeedu-4.3.75svn1048496.desktop-fix/cantor/src/cantor_part.desktop +--- kdeedu-4.3.75svn1048496/cantor/src/cantor_part.desktop 2009-11-02 07:01:47.000000000 -0500 ++++ kdeedu-4.3.75svn1048496.desktop-fix/cantor/src/cantor_part.desktop 2009-11-22 20:53:42.000000000 -0500 +@@ -11,9 +11,9 @@ + Name[sv]=Cantor-delprogram + Name[tr]=CantorPart + Name[uk]=CantorPart + Name[x-test]=xxCantorPartxx + Name[zh_TW]=Cantor 部件 +-MimeType=application/x-cantor ++MimeType=application/x-cantor; + ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart + X-KDE-Library=libcantorpart + Type=Service +diff -r -U5 kdeedu-4.3.75svn1048496/cantor/src/CMakeLists.txt kdeedu-4.3.75svn1048496.desktop-fix/cantor/src/CMakeLists.txt +--- kdeedu-4.3.75svn1048496/cantor/src/CMakeLists.txt 2009-11-13 05:57:58.000000000 -0500 ++++ kdeedu-4.3.75svn1048496.desktop-fix/cantor/src/CMakeLists.txt 2009-11-23 00:06:17.000000000 -0500 +@@ -64,9 +64,9 @@ + cantorlibs cantor_config ) + 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} ) diff --git a/kdeedu-4.3.75-enable-kalzium.patch b/kdeedu-4.3.75-enable-kalzium.patch new file mode 100644 index 0000000..62c21b3 --- /dev/null +++ b/kdeedu-4.3.75-enable-kalzium.patch @@ -0,0 +1,16 @@ +diff -r -U5 kdeedu-4.3.75svn1048496/CMakeLists.txt kdeedu-4.3.75svn1048496.enable-kalzium/CMakeLists.txt +--- kdeedu-4.3.75svn1048496/CMakeLists.txt 2009-11-13 05:58:16.000000000 -0500 ++++ kdeedu-4.3.75svn1048496.enable-kalzium/CMakeLists.txt 2009-11-23 00:39:15.000000000 -0500 +@@ -84,11 +84,11 @@ + macro_optional_add_subdirectory(kalgebra) + macro_optional_add_subdirectory(rocs) + + macro_optional_find_package(Eigen2 2.0.3) + macro_log_feature(EIGEN2_FOUND "Eigen2" "A generic C++ template library for dense and sparse matrices" "http://eigen.tuxfamily.org" FALSE "2.0.3" "Required to build Step.") +-#macro_optional_add_subdirectory(kalzium) ++macro_optional_add_subdirectory(kalzium) + if (EIGEN2_FOUND AND NOT WIN32) + macro_optional_add_subdirectory(step) + endif (EIGEN2_FOUND AND NOT WIN32) + macro_optional_add_subdirectory(doc) + macro_display_feature_log() diff --git a/kdeedu.spec b/kdeedu.spec index f26539a..d9cce1b 100644 --- a/kdeedu.spec +++ b/kdeedu.spec @@ -1,3 +1,4 @@ +%define alphatag svn1048496 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and # ocaml-facile. @@ -7,17 +8,19 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.3.3 -Release: 2%{?dist} +Version: 4.3.75 +Release: 0.1.%{alphatag}%{?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 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}%{?alphatag}.tar.bz2 Patch1: kdeedu-4.2.0-indi_nodrivers.patch +Patch2: kdeedu-4.3.75-desktop-fix.patch +Patch3: kdeedu-4.3.75-enable-kalzium.patch ## upstream patches Obsoletes: kdeedu4 < %{version}-%{release} @@ -40,6 +43,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 +52,7 @@ BuildRequires: ocaml(compiler) BuildRequires: ocaml-facile-devel %endif BuildRequires: python-devel python +BuildRequires: R-devel BuildRequires: readline-devel ## BR's FIXME/TODO: @@ -76,6 +81,7 @@ Requires: python-mwclient %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 +92,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 +172,11 @@ Educational/Edutainment Math applications: %prep -%setup -q -n kdeedu-%{version} +%setup -q -n kdeedu-%{version}%{?alphatag} %patch1 -p1 -b .indi_nodrivers +%patch2 -p1 -b .desktop-fix +%patch3 -p1 -b .enable-kalzium %build @@ -277,6 +286,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 +300,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 +321,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 +346,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 +357,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 +373,13 @@ 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}/kalzium.knsrc %{_kde4_configdir}/kanagram.knsrc %{_kde4_configdir}/khangman.knsrc @@ -357,6 +389,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/ @@ -370,6 +403,7 @@ rm -rf %{buildroot} %{_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 +413,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 +429,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 +446,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,6 +531,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 22 2009 Ben Boeckel - 4.3.75-0.1.svn1048496 +- Update to 4.3.75 snapshot + * Wed Nov 11 2009 Than Ngo - 4.3.3-2 - rhel cleanup diff --git a/sources b/sources index bc5197f..e415320 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d9d7a34bccb0880d1cdf181f92da217 kdeedu-4.3.3.tar.bz2 +ff92e80e2e391a081802d2d571fdf2e2 kdeedu-4.3.75svn1048496.tar.bz2