From b2d2859981dd2b0e409c30acb5f10a0cf3b9f87a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 24 2008 15:41:44 +0000 Subject: - 4.0.99 --- diff --git a/kdeedu.spec b/kdeedu.spec index 584fb3c..e1c7fbe 100644 --- a/kdeedu.spec +++ b/kdeedu.spec @@ -13,8 +13,8 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.0.5 -Release: 2%{?dist} +Version: 4.0.99 +Release: 1%{?dist} License: GPLv2 Group: Amusements/Games @@ -22,7 +22,8 @@ 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.0.4-cfitsio.patch +# fix cfitsio detection by using pkgconfig +Patch0: kdeedu-4.0.4-cfitsio.patch # http://bugzilla.redhat.com/371121 Obsoletes: kalgebra < 1:0.7-7 @@ -43,17 +44,24 @@ BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: eigen-devel BuildRequires: giflib-devel +BuildRequires: gmm-devel BuildRequires: gpsd-devel +BuildRequires: gsl-devel +# for libplasma +BuildRequires: kdebase-workspace-devel >= %{version} BuildRequires: kdelibs4-devel >= %{version} # for macros.kde4 BuildRequires: kde-filesystem BuildRequires: libnova-devel +BuildRequires: libqalculate-devel BuildRequires: libusb-devel +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel %if 0%{?with_facile} BuildRequires: ocaml(compiler) BuildRequires: ocaml-facile-devel %endif -BuildRequires: openbabel-devel +BuildRequires: openbabel-devel >= 2.2.0-0.4.b5 BuildRequires: pcre-devel BuildRequires: python-devel python BuildRequires: readline-devel @@ -61,28 +69,28 @@ BuildRequires: readline-devel #+ libsbigudrv, 1.00: SBIG Universal Driver is needed by KStars %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +# split pkgs, (temporary?) upgrade path -- Rex +Requires: %{name}-kstars = %{version}-%{release} +Requires: %{name}-math = %{version}-%{release} Requires(post): xdg-utils Requires(postun): xdg-utils %description Educational/Edutainment applications: * blinken: Simon Says Game -* kalgebra: MathML-based graph calculator -* kbruch: Exercise Fractions -* kgeography: Geography Trainer +* kalzium: A periodic table of the elements +* kanagram: Anagram game +* kgeography: Learn geography * khangman: Hangman Game -* kig: Interactive Geometry * kiten: Japanese Reference/Study Tool * klettres: French alphabet tutor -* kmplot: Mathematical Function Plotter -* kpercentage: Excersie Percentages -* kstars: Desktop Planetarium -* ktouch: Touch Typing Tutor +* ktouch: Learn and practice touch typing * kturtle: Logo Programming Environment -* kvoctrain: Vocabulary Trainer -* kwordquiz: Vocabulary Trainer -* marble: Virtual Globe +* kwordquiz: Flashcard and vocabulary learning +* marble: A World Atlas +* parley: Vocabulary Trainer +* step: Interactive physical simulator %package libs Summary: Runtime libraries for %{name} @@ -93,7 +101,7 @@ Group: System Environment/Libraries %package devel Group: Development/Libraries Summary: Developer files for %{name} -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Obsoletes: kdeedu4-devel < %{version}-%{release} Provides: kdeedu4-devel = %{version}-%{release} # http://bugzilla.redhat.com/394011 @@ -105,11 +113,34 @@ Requires: pcre-devel %description devel %{summary}. +%package kstars +Group: Amusements/Games +Summary: Desktop Planetarium +Requires: %{name}-libs = %{version}-%{release} +Requires(post): xdg-utils +Requires(postun): xdg-utils +%description kstars +%{summary}. + +%package math +Group: Amusements/Games +Summary: Math applications +Requires: %{name}-libs = %{version}-%{release} +Requires(post): xdg-utils +Requires(postun): xdg-utils +Provides: kdeedu4-math = %{version}-%{release} +%description math +Educational/Edutainment Math applications: +* kalgebra: MathML-based graph calculator +* kbruch: Exercise Fractions +* kig: Interactive Geometry +* kmplot: Mathematical Function Plotter +* kpercentage: Excersize Percentages + %prep %setup -q -n kdeedu-%{version} - -%patch1 -p1 -b .cfitsio +%patch0 -p1 -b .cfitsio %build @@ -119,9 +150,7 @@ pushd %{_target_platform} %{cmake_kde4} .. popd -# smp build busted? -make -k %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 || \ - make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -129,6 +158,10 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} +# #unpackaged files +# omit stuff for which there isn't a clear public API +rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,compoundviewer,htmesh,sbigudrv}.{a,so} + %post xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : @@ -144,6 +177,18 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %postun libs -p /sbin/ldconfig +%post kstars +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + +%postun kstars +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + +%post math +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + +%postun math +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + %clean rm -rf %{buildroot} @@ -151,44 +196,260 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING README -%{_kde4_bindir}/* -%{_kde4_appsdir}/* -%{_kde4_configdir}/* -%{_kde4_datadir}/applications/kde4/* -%{_kde4_datadir}/config.kcfg/* -%{_kde4_datadir}/kde4/services/*.desktop -%{_kde4_docdir}/HTML/en/* -%{_kde4_iconsdir}/hicolor/*/*/* +# FIXME/TODO : sort file list into per-app sections. ? -- Rex +%{_kde4_bindir}/blinken +%{_kde4_bindir}/geodatatest +%{_kde4_bindir}/indi* +%{_kde4_bindir}/kalzium +%{_kde4_bindir}/kanagram +%{_kde4_bindir}/kgeography +%{_kde4_bindir}/khangman +%{_kde4_bindir}/kiten +%{_kde4_bindir}/kitengen +%{_kde4_bindir}/kitenradselect +%{_kde4_bindir}/klettres +%{_kde4_bindir}/ktouch +%{_kde4_bindir}/kturtle +%{_kde4_bindir}/kwordquiz +%{_kde4_bindir}/marble +%{_kde4_bindir}/parley +%{_kde4_bindir}/step +%{_kde4_bindir}/tilecreator + +# FIXME? +%{_kde4_appsdir}/desktoptheme/ +%{_kde4_appsdir}/blinken/ +%{_kde4_appsdir}/kalzium/ +%{_kde4_appsdir}/kanagram/ +%{_kde4_appsdir}/kgeography/ +%{_kde4_appsdir}/khangman/ +%{_kde4_appsdir}/kiten/ +%{_kde4_appsdir}/kitenradselect/ +%{_kde4_appsdir}/klettres/ +%{_kde4_appsdir}/ktouch/ +%{_kde4_appsdir}/kturtle/ +%{_kde4_appsdir}/kvtml/ +%{_kde4_appsdir}/kwordquiz/ +%{_kde4_appsdir}/marble/ +%{_kde4_appsdir}/marble_part/ +%{_kde4_appsdir}/parley/ +%{_kde4_appsdir}/step/ + +%{_kde4_datadir}/kde4/services/marble_part.desktop +%{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop +%{_kde4_datadir}/kde4/services/plasma_parley.desktop + +%{_kde4_libdir}/kde4/libmarble_part.so +%{_kde4_libdir}/kde4/plasma_applet_kalgebra.so +%{_kde4_libdir}/kde4/plasma_applet_parley.so +%{_kde4_libdir}/kde4/plasma_engine_parley.so +%{_kde4_datadir}/applications/kde4/blinken.desktop +%{_kde4_datadir}/applications/kde4/kalzium.desktop +%{_kde4_datadir}/applications/kde4/kanagram.desktop +%{_kde4_datadir}/applications/kde4/kgeography.desktop +%{_kde4_datadir}/applications/kde4/khangman.desktop +%{_kde4_datadir}/applications/kde4/kiten.desktop +%{_kde4_datadir}/applications/kde4/klettres.desktop +%{_kde4_datadir}/applications/kde4/ktouch.desktop +%{_kde4_datadir}/applications/kde4/kturtle.desktop +%{_kde4_datadir}/applications/kde4/kwordquiz.desktop +%{_kde4_datadir}/applications/kde4/marble.desktop +%{_kde4_datadir}/applications/kde4/parley.desktop +%{_kde4_datadir}/applications/kde4/step.desktop + +%{_kde4_datadir}/config.kcfg/blinken.kcfg +%{_kde4_datadir}/config.kcfg/documentsettings.kcfg +%{_kde4_datadir}/config.kcfg/kalzium.kcfg +%{_kde4_datadir}/config.kcfg/kanagram.kcfg +%{_kde4_datadir}/config.kcfg/kgeography.kcfg +%{_kde4_datadir}/config.kcfg/khangman.kcfg +%{_kde4_datadir}/config.kcfg/kiten.kcfg +%{_kde4_datadir}/config.kcfg/klettres.kcfg +%{_kde4_datadir}/config.kcfg/ktouch.kcfg +%{_kde4_datadir}/config.kcfg/kwordquiz.kcfg +%{_kde4_datadir}/config.kcfg/languagesettings.kcfg +%{_kde4_datadir}/config.kcfg/marble.kcfg +%{_kde4_datadir}/config.kcfg/parley.kcfg +%{_kde4_datadir}/config.kcfg/step.kcfg +%{_kde4_datadir}/config/kalzium.knsrc +%{_kde4_datadir}/config/kanagram.knsrc +%{_kde4_datadir}/config/khangman.knsrc +%{_kde4_datadir}/config/klettres.knsrc +%{_kde4_datadir}/config/kwordquiz.knsrc +%{_kde4_datadir}/config/parley.knsrc +%{_kde4_datadir}/config/step.knsrc + +%{_kde4_docdir}/HTML/en/blinken/ +%{_kde4_docdir}/HTML/en/kalzium/ +%{_kde4_docdir}/HTML/en/kanagram/ +%{_kde4_docdir}/HTML/en/kgeography/ +%{_kde4_docdir}/HTML/en/khangman/ +%{_kde4_docdir}/HTML/en/kiten/ +%{_kde4_docdir}/HTML/en/klettres/ +%{_kde4_docdir}/HTML/en/ktouch/ +%{_kde4_docdir}/HTML/en/kturtle +%{_kde4_docdir}/HTML/en/kwordquiz/ +%{_kde4_docdir}/HTML/en/marble/ +%{_kde4_docdir}/HTML/en/parley/ +%{_kde4_docdir}/HTML/en/step/ + +%{_kde4_iconsdir}/hicolor/*/*/blinken.* +%{_kde4_iconsdir}/hicolor/*/*/kalzium.* +%{_kde4_iconsdir}/hicolor/*/*/kanagram.* +%{_kde4_iconsdir}/hicolor/*/*/kgeography.* +%{_kde4_iconsdir}/hicolor/*/*/khangman.* +%{_kde4_iconsdir}/hicolor/*/*/kiten.* +%{_kde4_iconsdir}/hicolor/*/*/klettres.* +%{_kde4_iconsdir}/hicolor/*/*/ktouch.* +%{_kde4_iconsdir}/hicolor/*/*/kturtle.* +%{_kde4_iconsdir}/hicolor/*/*/kwordquiz.* +%{_kde4_iconsdir}/hicolor/*/*/marble.* +%{_kde4_iconsdir}/hicolor/*/*/parley*.* +%{_kde4_iconsdir}/hicolor/*/*/step.* %{_kde4_iconsdir}/oxygen/*/*/* -%{_kde4_libdir}/kde4/* + %{_kde4_libdir}/avogadro-kalzium/ -%{_datadir}/dbus-1/interfaces/* +# marble +%{_kde4_libdir}/libcompoundviewer.so.* %files libs %defattr(-,root,root,-) -%{_kde4_libdir}/lib*.so.* +%doc COPYING README +%{_kde4_libdir}/libanalitza.so.* +%{_kde4_libdir}/libavogadro-kalzium.so.* +%{_kde4_libdir}/libkdeedu*.so.* +%{_kde4_libdir}/libkeduvocdocument.so.* +%{_kde4_libdir}/libkiten.so.* +%{_kde4_libdir}/libmarble*.so.* +%{_kde4_libdir}/libsbigudrv.so.* +%{_kde4_libdir}/libscience.so.* +%{_kde4_appsdir}/libkdeedu/ +%{_kde4_libdir}/kde4/plugins/marble/ %files devel %defattr(-,root,root,-) -%{_kde4_includedir}/* +%{_kde4_appsdir}/cmake/modules +%{_kde4_includedir}/libkdeedu/ +%{_kde4_includedir}/libkiten/ %{_includedir}/marble/ -%{_kde4_libdir}/lib*.so -%{_kde4_libdir}/libhtmesh.a +%{_kde4_libdir}/libavogadro-kalzium.so +%{_kde4_libdir}/libkdeedu*.so +%{_kde4_libdir}/libkeduvocdocument.so +%{_kde4_libdir}/libkiten.so +%{_kde4_libdir}/libmarble*.so +%{_kde4_libdir}/libscience.so +%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so + +%files kstars +%defattr(-,root,root,-) +%{_kde4_bindir}/kstars +%{_kde4_datadir}/applications/kde4/kstars.desktop +%{_kde4_datadir}/config.kcfg/kstars.kcfg +%{_kde4_configdir}/kstars.knsrc +%{_kde4_docdir}/HTML/en/kstars/ +%{_kde4_appsdir}/kstars/ +%{_kde4_iconsdir}/hicolor/*/*/kstars.* +%{_kde4_libdir}/libSatLib.so.* + +%files math +%defattr(-,root,root,-) +%doc COPYING README +%{_kde4_bindir}/calgebra +%{_kde4_bindir}/kalgebra +%{_kde4_bindir}/kbruch +%{_kde4_bindir}/kig +%{_kde4_bindir}/kmplot +%{_kde4_bindir}/kpercentage +%{_kde4_bindir}/pykig.* +%{_kde4_libdir}/kde4/kigpart.* +%{_kde4_libdir}/kde4/libkmplotpart.* +%{_kde4_datadir}/applications/kde4/kalgebra.desktop +%{_kde4_datadir}/applications/kde4/kbruch.desktop +%{_kde4_datadir}/applications/kde4/kig.desktop +%{_kde4_datadir}/applications/kde4/kmplot.desktop +%{_kde4_datadir}/applications/kde4/kpercentage.desktop +%{_kde4_datadir}/config.kcfg/kbruch.kcfg +%{_kde4_datadir}/config.kcfg/kmplot.kcfg +%{_datadir}/dbus-1/interfaces/org.kde.kmplot.* +%{_kde4_docdir}/HTML/en/kpercentage/ +%{_kde4_docdir}/HTML/en/kalgebra/ +%{_kde4_docdir}/HTML/en/kbruch/ +%{_kde4_docdir}/HTML/en/kig/ +%{_kde4_docdir}/HTML/en/kmplot/ +%{_kde4_iconsdir}/hicolor/*/*/kalgebra.* +%{_kde4_iconsdir}/hicolor/*/*/kbruch.* +%{_kde4_iconsdir}/hicolor/*/*/kig.* +%{_kde4_iconsdir}/hicolor/*/*/kmplot.* +%{_kde4_iconsdir}/hicolor/*/*/kpercentage.* +%{_kde4_iconsdir}/hicolor/*/*/application-x-kig.* +%{_kde4_appsdir}/katepart/syntax/python-kig.xml +%{_kde4_appsdir}/kbruch/ +%{_kde4_appsdir}/kig/ +%{_kde4_appsdir}/kmplot/ +%{_kde4_appsdir}/kpercentage/ +%{_kde4_datadir}/kde4/services/kalgebraplasmoid.desktop +%{_kde4_datadir}/kde4/services/kig_part.desktop +%{_kde4_datadir}/kde4/services/kmplot_part.desktop %changelog -* Mon Jul 07 2008 Kevin Kofler 4.0.5-2 +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Mon Jul 07 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Mon Jul 07 2008 Kevin Kofler 4.0.84-2 - rebuild for new OpenBabel -* Sun Jun 01 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Thu Jun 26 2008 Rex Dieter 4.0.83-2 +- %%description: update for new apps +- -math subpkg (#446093) +- -devel: omit a few lib*.so symlinks for those with non-public apis +- -devel: move designer plugins here + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Sun Jun 15 2008 Rex Dieter 4.0.82-1 +- 4.0.82 + +* Fri Jun 06 2008 Kevin Kofler 4.0.80-5 +- BR OpenBabel 2.2.0 beta5, drop build fix hack for beta 4 + +* Thu Jun 05 2008 Kevin Kofler 4.0.80-4 +- backport upstream fix for Step build + +* Tue Jun 03 2008 Kevin Kofler 4.0.80-3 +- add BR gmm-devel, libqalculate-devel and gsl-devel for Step + +* Tue May 27 2008 Kevin Kofler 4.0.80-2 +- patch to build against OpenBabel 2.2.0 beta4 + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 + +* Fri May 23 2008 Kevin Kofler 4.0.72-3 +- put unversioned libanalitza.so in -libs instead of -devel (#448035) + +* Thu May 08 2008 Rex Dieter 4.0.72-2 +- -kstars subpkg (#432317) -* Wed May 07 2008 Rex Dieter 4.0.4-2 -- still need cfitsio patch +* Thu May 08 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 +- use pkgconfig for cfitsio patch now that cfitsio.pc has been fixed +- add BR kdebase-workspace-devel for plasmoids +- add BR libxml2-devel, libxslt-devel for Parley HTML export +- BR new minimum version of openbabel-devel -* Tue May 06 2008 Rex Dieter 4.0.4-1 -- kde-4.0.4 +* Wed Apr 23 2008 Kevin Kofler 4.0.3-4 +- rebuild for new ocaml (3.10.2) * Thu Apr 03 2008 Kevin Kofler 4.0.3-3 - rebuild (again) for the fixed %%{_kde4_buildtype}