packages: kde4-kdeedu/kde4-kdeedu.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Thu Feb 18 01:49:14 CET 2010


Author: shadzik                      Date: Thu Feb 18 00:49:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdeedu:
   kde4-kdeedu.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: packages/kde4-kdeedu/kde4-kdeedu.spec
diff -u packages/kde4-kdeedu/kde4-kdeedu.spec:1.48 packages/kde4-kdeedu/kde4-kdeedu.spec:1.49
--- packages/kde4-kdeedu/kde4-kdeedu.spec:1.48	Thu Jan 28 23:14:43 2010
+++ packages/kde4-kdeedu/kde4-kdeedu.spec	Thu Feb 18 01:49:09 2010
@@ -1,27 +1,28 @@
 # $Revision$, $Date$
-# TODO:
-# - dep not recognized: libindi-devel - http://indi.sf.net
 
 %define		_state		stable
 %define		orgname		kdeedu
+%define		qtver		4.6.1
 
 Summary:	K Desktop Environment - edutainment
 Summary(pl.UTF-8):	K Desktop Environment - edukacja i rozrywka
 Name:		kde4-kdeedu
-Version:	4.3.5
+Version:	4.4.0
 Release:	1
 License:	GPL
 Group:		X11/Applications/Games
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	5755742477a9db101c03269393ee36ad
-#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+# Source0-md5:	ce6a1b694e881f12553b2409504b8694
 Patch0:		%{name}-findindi.patch
-BuildRequires:	Qt3Support-devel
-BuildRequires:	QtDesigner-devel
-BuildRequires:	QtOpenGL-devel
-BuildRequires:	QtSvg-devel
-BuildRequires:	QtTest-devel
-BuildRequires:	QtWebKit-devel
+Patch1:		%{name}-R.patch
+BuildRequires:	R
+BuildRequires:	Qt3Support-devel >= %{qtver}
+BuildRequires:	QtDesigner-devel >= %{qtver}
+BuildRequires:	QtOpenGL-devel >= %{qtver}
+BuildRequires:	QtScriptTools-devel >= %{qtver}
+BuildRequires:	QtSvg-devel >= %{qtver}
+BuildRequires:	QtTest-devel >= %{qtver}
+BuildRequires:	QtWebKit-devel >= %{qtver}
 BuildRequires:	automoc4
 BuildRequires:	boost-python-devel
 BuildRequires:	cfitsio-devel
@@ -33,20 +34,21 @@
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	libindi-devel
 BuildRequires:	libnova-devel
-BuildRequires:	libqalculate-devel
+BuildRequires:	libqalculate-devel >= 0.9.5
 BuildRequires:	libxslt-devel
 BuildRequires:	ocaml
 BuildRequires:	ocaml-facile
 BuildRequires:	openbabel-devel >= 2.2.0
 BuildRequires:	pkgconfig
-#BuildRequires:	python-PyKDE4
+BuildRequires:	python-PyKDE4 >= %{version}
+BuildRequires:	python-PyQt4-devel >= 4.7
 BuildRequires:	python-sip-devel
-BuildRequires:	qt4-build
-BuildRequires:	qt4-qmake
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	readline-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.129
-#BuildRequires:	xplanet >= 1.0
+BuildRequires:	xplanet >= 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -59,6 +61,7 @@
 Summary:	Header files for kdeedu libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek kdeedu
 Group:		X11/Development/Libraries
+Requires:	%{name}-libkdeeducore = %{version}-%{release}
 Requires:	%{name}-marble = %{version}-%{release}
 
 %description devel
@@ -78,6 +81,28 @@
 %description blinken -l pl.UTF-8
 Wersja KDE dobrze znanej gry "Simon Says".
 
+%package cantor
+Summary:	Cantor
+Summary(pl.UTF-8):	Cantor
+Group:		X11/Applications/Science
+
+%description cantor
+Cantor.
+
+%description cantor -l pl.UTF-8
+Cantor.
+
+%package rocs
+Summary:	Rocs Graph Theory
+Summary(pl.UTF-8):	Rocs - Teoria Wykresów
+Group:		X11/Applications/Science
+
+%description rocs
+Graph Theory Tool for Professors and Students.
+
+%description rocs -l pl.UTF-8
+Teoria wykresów dla profesorów oraz studentów.
+
 %package kalzium
 Summary:	A Periodic System of Elements database
 Summary(pl.UTF-8):	Baza danych Układu Okresowego Pierwiastków
@@ -420,6 +445,7 @@
 Summary:	Geographical map for KDE
 Summary(pl.UTF-8):	Mapa geograficzna dla KDE
 Group:		X11/Libraries
+Requires:	python-PyKDE4 = %{version}
 
 %description marble
 Marble is a geographical map for KDE.
@@ -472,6 +498,7 @@
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p0
+%patch1 -p0
 
 %build
 install -d build
@@ -484,6 +511,7 @@
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
+	-DEXPERIMENTAL_PYTHON_BINDINGS=TRUE \
 	../
 
 %{__make}
@@ -496,6 +524,7 @@
 	kde_htmldir=%{_kdedocdir}
 
 %find_lang blinken	--with-kde
+%find_lang cantor	--with-kde
 %find_lang kalgebra	--with-kde
 %find_lang kalzium	--with-kde
 %find_lang kanagram	--with-kde
@@ -513,6 +542,7 @@
 %find_lang kwordquiz	--with-kde
 %find_lang marble	--with-kde
 %find_lang parley	--with-kde
+%find_lang rocs		--with-kde
 %find_lang step		--with-kde
 
 %post marble -p /sbin/ldconfig
@@ -533,7 +563,12 @@
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libSatLib.so
+%attr(755,root,root) %{_libdir}/libkeduvocdocument.so
+%attr(755,root,root) %{_libdir}/libscience.so
+%attr(755,root,root) %{_libdir}/libkdeeduui.so
 %attr(755,root,root) %{_libdir}/libanalitza.so
+%attr(755,root,root) %{_libdir}/libanalitzagui.so
 %attr(755,root,root) %{_libdir}/libavogadro-kalzium.so
 %attr(755,root,root) %{_libdir}/libkiten.so
 %attr(755,root,root) %{_libdir}/libmarblewidget.so
@@ -552,18 +587,89 @@
 %{_iconsdir}/hicolor/scalable/apps/blinken.svgz
 %{_iconsdir}/hicolor/*x*/apps/blinken.png
 
+%files cantor -f cantor.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cantor
+%attr(755,root,root) %{_bindir}/cantor_rserver
+%attr(755,root,root) %{_libdir}/kde4/cantor_creatematrixassistant.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_differentiateassistant.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_eigenvaluesassistant.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_eigenvectorsassistant.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_integrateassistant.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_invertmatrixassistant.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_kalgebrabackend.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_maximabackend.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_nullbackend.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_plot2dassistant.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_plot3dassistant.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_rbackend.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_runscriptassistant.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_sagebackend.so
+%attr(755,root,root) %{_libdir}/kde4/cantor_solveassistant.so
+%attr(755,root,root) %{_libdir}/kde4/libcantorpart.so
+%attr(755,root,root) %{_libdir}/libcantorlibs.so
+%attr(755,root,root) %{_libdir}/libcantorlibs.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcantorlibs.so.?
+%attr(755,root,root) %{_libdir}/libcantor_config.so
+%{_desktopdir}/kde4/cantor.desktop
+%{_desktopdir}/kde4/cantor_part.desktop
+%{_datadir}/apps/cantor
+%{_datadir}/apps/cantorpart
+%{_datadir}/config.kcfg/cantor.kcfg
+%{_datadir}/config.kcfg/cantor_libs.kcfg
+%{_datadir}/config.kcfg/maximabackend.kcfg
+%{_datadir}/config.kcfg/sagebackend.kcfg
+%{_datadir}/config.kcfg/rserver.kcfg
+%{_datadir}/config/cantor*.knsrc
+%{_iconsdir}/hicolor/16x16/apps/cantor.png
+%{_iconsdir}/hicolor/32x32/apps/cantor.png
+%{_iconsdir}/hicolor/48x48/apps/cantor.png
+%{_iconsdir}/hicolor/48x48/apps/maximabackend.png
+%{_iconsdir}/hicolor/48x48/apps/rbackend.png
+%{_iconsdir}/hicolor/48x48/apps/sagebackend.png
+%{_iconsdir}/oxygen/22x22/actions/pointer.png
+%dir %{_datadir}/kde4/services/cantor
+%{_datadir}/kde4/services/cantor/creatematrixassistant.desktop
+%{_datadir}/kde4/services/cantor/differentiateassistant.desktop
+%{_datadir}/kde4/services/cantor/eigenvaluesassistant.desktop
+%{_datadir}/kde4/services/cantor/eigenvectorsassistant.desktop
+%{_datadir}/kde4/services/cantor/integrateassistant.desktop
+%{_datadir}/kde4/services/cantor/invertmatrixassistant.desktop
+%{_datadir}/kde4/services/cantor/kalgebrabackend.desktop
+%{_datadir}/kde4/services/cantor/maximabackend.desktop
+%{_datadir}/kde4/services/cantor/nullbackend.desktop
+%{_datadir}/kde4/services/cantor/plot2dassistant.desktop
+%{_datadir}/kde4/services/cantor/plot3dassistant.desktop
+%{_datadir}/kde4/services/cantor/rbackend.desktop
+%{_datadir}/kde4/services/cantor/runscriptassistant.desktop
+%{_datadir}/kde4/services/cantor/sagebackend.desktop
+%{_datadir}/kde4/services/cantor/solveassistant.desktop
+%{_datadir}/kde4/servicetypes/cantor_assistant.desktop
+%{_datadir}/kde4/servicetypes/cantor_backend.desktop
+#%{_kdedocdir}/en/cantor
+
+%files rocs -f rocs.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rocs
+%{_desktopdir}/kde4/rocs.desktop
+%{_datadir}/apps/rocs
+%{_datadir}/config.kcfg/rocs.kcfg
+%{_iconsdir}/hicolor/*x*/actions/rocs*.png
+
 %files kalzium -f kalzium.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kalzium
 %attr(755,root,root) %{_libdir}/kde4/plasma_engine_kalzium.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_applet_didyouknow.so
+%attr(755,root,root) %{_libdir}/kde4/concentrationCalculator.so
+%attr(755,root,root) %{_libdir}/kde4/gasCalculator.so
+%attr(755,root,root) %{_libdir}/kde4/nuclearCalculator.so
 
 %attr(755,root,root) %ghost %{_libdir}/libavogadro-kalzium.so.?
 %attr(755,root,root) %{_libdir}/libavogadro-kalzium.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcompoundviewer.so.?
 %attr(755,root,root) %{_libdir}/libcompoundviewer.so.*.*.*
 
-%dir %{_libdir}/avogadro-kalzium/engines
 %dir %{_libdir}/avogadro-kalzium/
 %dir %{_libdir}/avogadro-kalzium/colors
 %attr(755,root,root) %{_libdir}/avogadro-kalzium/colors/libchargecolor.so
@@ -609,6 +715,9 @@
 %{_datadir}/config.kcfg/kalzium.kcfg
 %{_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
 %{_datadir}/kde4/services/plasma_didyouknow.desktop
+%{_datadir}/kde4/services/concentrationCalculator.desktop
+%{_datadir}/kde4/services/gasCalculator.desktop
+%{_datadir}/kde4/services/nuclearCalculator.desktop
 %{_desktopdir}/kde4/kalzium.desktop
 %{_iconsdir}/hicolor/scalable/apps/kalzium.svgz
 %{_iconsdir}/hicolor/*x*/apps/kalzium.png
@@ -723,7 +832,6 @@
 
 %files kstars -f kstars.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libSatLib.so
 %attr(755,root,root) %{_libdir}/libhtmesh.a
 #%attr(755,root,root) %{_libdir}/libsbigudrv.so
 #%attr(755,root,root) %{_bindir}/indiserver
@@ -780,25 +888,24 @@
 
 %files libkdeeducore
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libkeduvocdocument.so
-%attr(755,root,root) %{_libdir}/libscience.so
 %{_datadir}/apps/libkdeedu
-%attr(755,root,root) %{_libdir}/libkdeeduui.so
-%attr(755,root,root) %{_libdir}/libSatLib.so.4
-%attr(755,root,root) %{_libdir}/libSatLib.so.4.3.0
-%attr(755,root,root) %{_libdir}/libkdeeduui.so.4
-%attr(755,root,root) %{_libdir}/libkdeeduui.so.4.3.0
-%attr(755,root,root) %{_libdir}/libkeduvocdocument.so.4
-%attr(755,root,root) %{_libdir}/libkeduvocdocument.so.4.3.0
+%attr(755,root,root) %ghost %{_libdir}/libSatLib.so.?
+%attr(755,root,root) %{_libdir}/libSatLib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdeeduui.so.?
+%attr(755,root,root) %{_libdir}/libkdeeduui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkeduvocdocument.so.?
+%attr(755,root,root) %{_libdir}/libkeduvocdocument.so.*.*.*
 #%attr(755,root,root) %{_libdir}/libsbigudrv.so.1
 #%attr(755,root,root) %{_libdir}/libsbigudrv.so.1.0.0
-%attr(755,root,root) %{_libdir}/libscience.so.4
-%attr(755,root,root) %{_libdir}/libscience.so.4.3.0
+%attr(755,root,root) %ghost %{_libdir}/libscience.so.?
+%attr(755,root,root) %{_libdir}/libscience.so.*.*.*
 
 %files kalgebra -f kalgebra.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %ghost %{_libdir}/libanalitza.so.?
 %attr(755,root,root) %{_libdir}/libanalitza.so.*.*.*
+%attr(755,root,root) %{_libdir}/libanalitzagui.so.?
+%attr(755,root,root) %{_libdir}/libanalitzagui.so.*.*.*
 %attr(755,root,root) %{_bindir}/kalgebra
 %{_desktopdir}/kde4/kalgebra.desktop
 %attr(755,root,root) %{_libdir}/kde4/plasma_applet_kalgebra.so
@@ -827,10 +934,12 @@
 %attr(755,root,root) %{_libdir}/kde4/plugins/marble/GpsdPositionProviderPlugin.so
 %attr(755,root,root) %{_libdir}/kde4/plugins/marble/GraticulePlugin.so
 %attr(755,root,root) %{_libdir}/kde4/plugins/marble/OverviewMap.so
+#%attr(755,root,root) %{_libdir}/kde4/plugins/marble/OsmAnnotatePlugin.so
 %attr(755,root,root) %{_libdir}/kde4/plugins/marble/Photo.so
 #%attr(755,root,root) %{_libdir}/kde4/plugins/marble/QHttpNetworkPlugin.so
 %attr(755,root,root) %{_libdir}/kde4/plugins/marble/QNamNetworkPlugin.so
 %attr(755,root,root) %{_libdir}/kde4/plugins/marble/StarsPlugin.so
+%attr(755,root,root) %{_libdir}/kde4/plugins/marble/Weather.so
 %attr(755,root,root) %{_libdir}/kde4/plugins/marble/Wikipedia.so
 
 %dir %{_datadir}/apps/marble_part
@@ -841,6 +950,7 @@
 %{_datadir}/kde4/services/plasma-applet-kworldclock.desktop
 %{_desktopdir}/kde4/marble.desktop
 %{_iconsdir}/hicolor/*x*/apps/marble.png
+%{py_sitedir}/PyKDE4/marble.so
 
 %files parley -f parley.lang
 %defattr(644,root,root,755)
@@ -879,25 +989,78 @@
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 $Log$
-Revision 1.48  2010/01/28 22:14:43  shadzik
-- 4.3.5
+Revision 1.49  2010/02/18 00:49:09  shadzik
+- merged from DEVEL
+
+Revision 1.42.2.23  2010/02/04 21:59:43  arekm
+- up to 4.4.0
+
+Revision 1.42.2.22  2010/02/02 23:04:38  shadzik
+- yeah, kill my stupidness (thx vip for noticing)
+
+Revision 1.42.2.21  2010/02/02 22:21:01  shadzik
+- BR: python-PyKDE4 and python-PyQt4-devel
+
+Revision 1.42.2.20  2010/02/02 20:54:56  shadzik
+- bump up qtver; it's not necessary but we make sure we link with the latest qtver
+
+Revision 1.42.2.19  2010/02/02 15:59:50  shadzik
+- minor clean up (removing old svn snap stuff)
+
+Revision 1.42.2.18  2010/02/02 15:42:03  shadzik
+- version qt4 BRs
+
+Revision 1.42.2.17  2010/02/01 11:42:12  shadzik
+- BR: R
+- files due to BR: R
+
+Revision 1.42.2.16  2010/02/01 11:31:49  shadzik
+- marble R: python-PyKDE4 due to the bindings
 
-Revision 1.47  2010/01/09 13:28:32  arekm
-- release 3
+Revision 1.42.2.15  2010/02/01 11:30:20  shadzik
+- add python bindings support to marble
 
-Revision 1.46  2010/01/01 13:04:23  arekm
-- release 2
+Revision 1.42.2.14  2010/02/01 00:52:13  shadzik
+- 4.4 RC3
 
-Revision 1.45  2009/12/04 03:16:14  sparky
+Revision 1.42.2.13  2010/01/20 09:59:12  arekm
+- up to 4.3.95
+
+Revision 1.42.2.12  2010/01/08 12:10:29  arekm
+- up to 4.3.90
+
+Revision 1.42.2.11  2009/12/21 00:34:40  shadzik
+- 4.4 Beta2
+
+Revision 1.42.2.10  2009/12/08 08:53:05  paszczus
+- added BR: QtScriptTools-devel
+
+Revision 1.42.2.9  2009/12/04 03:18:14  sparky
 - BR: Qt3Support-devel, QtDesigner-devel, QtSvg-devel, QtTest-devel,
-  automoc4, libqalculate-devel, libxslt-devel, pkgconfig, qt4-build,
-  qt4-qmake, rpm-pythonprov
+  automoc4, libxslt-devel, pkgconfig, qt4-build, qt4-qmake, rpm-pythonprov
+
+Revision 1.42.2.8  2009/12/03 23:21:02  shadzik
+- 4.4 beta1
+
+Revision 1.42.2.7  2009/10/29 14:39:25  paszczus
+- updated to 4.3.73
+
+Revision 1.42.2.6  2009/10/21 01:03:07  shadzik
+- cantor subpackage
+
+Revision 1.42.2.5  2009/10/20 23:40:30  shadzik
+- 4.3.72
+- fix BRs
+- md5!
+
+Revision 1.42.2.4  2009/10/08 12:13:02  cactus
+- updated TODO
 
-Revision 1.44  2009/11/28 19:31:03  shadzik
-- 4.3.4
+Revision 1.42.2.3  2009/10/08 11:56:57  cactus
+- updated TODO
 
-Revision 1.43  2009/10/31 13:55:50  shadzik
-- 4.3.3
+Revision 1.42.2.1  2009/10/07 23:46:20  cactus
+- up to 4.3.69
 
 Revision 1.42  2009/10/03 09:48:23  shadzik
 - 4.3.2 try #1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeedu/kde4-kdeedu.spec?r1=1.48&r2=1.49&f=u



More information about the pld-cvs-commit mailing list