Author: shadzik Date: Wed Jul 29 20:44:13 2009 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/kde4-kdeedu: kde4-kdeedu.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: packages/kde4-kdeedu/kde4-kdeedu.spec diff -u packages/kde4-kdeedu/kde4-kdeedu.spec:1.35 packages/kde4-kdeedu/kde4-kdeedu.spec:1.36 --- packages/kde4-kdeedu/kde4-kdeedu.spec:1.35 Sun Jul 12 05:24:34 2009 +++ packages/kde4-kdeedu/kde4-kdeedu.spec Wed Jul 29 22:44:07 2009 @@ -1,26 +1,30 @@ # $Revision$, $Date$ # TODO: # - dep not recognized: libindi-devel - http://indi.sf.net + %define _state stable %define orgname kdeedu + Summary: K Desktop Environment - edutainment Summary(pl.UTF-8): K Desktop Environment - edukacja i rozrywka Name: kde4-kdeedu -Version: 4.2.4 -Release: 2 +Version: 4.3.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: 007f3fd746e4a20dec255b8b5bae6023 +# Source0-md5: 4c309bcdc47274cea6f61206a42ef638 +#Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 Patch0: %{name}-findindi.patch BuildRequires: boost-python-devel BuildRequires: cfitsio-devel -BuildRequires: eigen +BuildRequires: eigen-devel >= 2.0.51 BuildRequires: gmm-devel BuildRequires: gpsd-devel -BuildRequires: libindi-devel +BuildRequires: gsl-devel >= 1.8 BuildRequires: kde4-kdebase-workspace-devel >= %{version} BuildRequires: kde4-kdelibs-devel >= %{version} +BuildRequires: libindi-devel BuildRequires: libnova-devel BuildRequires: ocaml BuildRequires: ocaml-facile @@ -29,6 +33,7 @@ BuildRequires: python-sip-devel BuildRequires: readline-devel BuildRequires: rpmbuild(macros) >= 1.129 +#BuildRequires: xplanet >= 1.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -460,6 +465,7 @@ cd build %cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \ -DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \ %if "%{_lib}" == "lib64" @@ -545,20 +551,41 @@ %attr(755,root,root) %{_libdir}/libcompoundviewer.so.*.*.* %dir %{_libdir}/avogadro-kalzium/engines -%dir %attr(755,root,root) %{_libdir}/avogadro-kalzium/ -%dir %attr(755,root,root) %{_libdir}/avogadro-kalzium/engines +%dir %{_libdir}/avogadro-kalzium/ +%dir %{_libdir}/avogadro-kalzium/colors +%attr(755,root,root) %{_libdir}/avogadro-kalzium/colors/libchargecolor.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/colors/libdistancecolor.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/colors/libindexcolor.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/colors/libresiduecolor.so + +%dir %{_libdir}/avogadro-kalzium/engines +%attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libaxesengine.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libcartoonengine.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libdipoleengine.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libforceengine.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libhbondengine.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/liblabelengine.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/liborbitalengine.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/liboverlayengine.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libpolygonengine.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libribbonengine.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libringengine.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libsimplewireengine.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libsphereengine.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libstickengine.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libsurfaceengine.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/engines/libwireengine.so %dir %{_libdir}/avogadro-kalzium/tools +%attr(755,root,root) %{_libdir}/avogadro-kalzium/tools/libaligntool.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/tools/libautoopttool.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/tools/libautorotatetool.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/tools/libbondcentrictool.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/tools/libclickmeasuretool.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/tools/libdrawtool.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/tools/libmanipulatetool.so %attr(755,root,root) %{_libdir}/avogadro-kalzium/tools/libnavigatetool.so +%attr(755,root,root) %{_libdir}/avogadro-kalzium/tools/libselectrotatetool.so # XXX: ugly dir deps? -> devel? %attr(755,root,root) %{_libdir}/kde4/plugins/designer/kalziumuiwidgets.so @@ -572,7 +599,7 @@ %{_desktopdir}/kde4/kalzium.desktop %{_iconsdir}/hicolor/scalable/apps/kalzium.svgz %{_iconsdir}/hicolor/*x*/apps/kalzium.png -%{_mandir}/man1/kalzium.1.gz +%{_mandir}/man1/kalzium.1* %files kanagram -f kanagram.lang %defattr(644,root,root,755) @@ -592,7 +619,7 @@ %{_desktopdir}/kde4/kbruch.desktop %{_iconsdir}/hicolor/scalable/apps/kbruch.svgz %{_iconsdir}/hicolor/*x*/apps/kbruch.png -%{_mandir}/man1/kbruch.1.gz +%{_mandir}/man1/kbruch.1* %files kgeography -f kgeography.lang %defattr(644,root,root,755) @@ -612,7 +639,7 @@ %{_desktopdir}/kde4/khangman.desktop %{_iconsdir}/hicolor/scalable/apps/khangman.svgz %{_iconsdir}/hicolor/*x*/apps/khangman.png -%{_mandir}/man6/khangman.6.gz +%{_mandir}/man6/khangman.6* %files kig -f kig.lang %defattr(644,root,root,755) @@ -626,7 +653,7 @@ %{_iconsdir}/hicolor/scalable/apps/kig.svgz %{_iconsdir}/hicolor/*x*/mimetypes/application-x-kig.png %{_iconsdir}/hicolor/scalable/mimetypes/application-x-kig.svgz -%{_mandir}/man1/kig.1.gz +%{_mandir}/man1/kig.1* # XXX pulls kate dep via dir. subpackage? %{_datadir}/apps/katepart/syntax/python-kig.xml @@ -669,7 +696,7 @@ %{_desktopdir}/kde4/kmplot.desktop %{_iconsdir}/hicolor/scalable/apps/kmplot.svgz %{_iconsdir}/hicolor/*x*/apps/kmplot.png -%{_mandir}/man1/kmplot.1.gz +%{_mandir}/man1/kmplot.1* %if 0 %files kpercentage -f kpercentage.lang @@ -719,7 +746,7 @@ %{_datadir}/config.kcfg/ktouch.kcfg %{_iconsdir}/hicolor/*x*/apps/ktouch.png %{_iconsdir}/hicolor/scalable/apps/ktouch.svgz -%{_mandir}/man1/ktouch.1.gz +%{_mandir}/man1/ktouch.1* %files kturtle -f kturtle.lang %defattr(644,root,root,755) @@ -745,15 +772,15 @@ %{_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.2.0 +%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.2.0 +%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.2.0 +%attr(755,root,root) %{_libdir}/libkeduvocdocument.so.4.3.0 #%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.2.0 +%attr(755,root,root) %{_libdir}/libscience.so.4.3.0 %files kalgebra -f kalgebra.lang %defattr(644,root,root,755) @@ -780,12 +807,18 @@ %dir %{_libdir}/kde4/plugins/marble %attr(755,root,root) %{_libdir}/kde4/plugins/marble/CompassFloatItem.so -%attr(755,root,root) %{_libdir}/kde4/plugins/marble/MarbleOverviewMap.so %attr(755,root,root) %{_libdir}/kde4/plugins/marble/MapScaleFloatItem.so -%attr(755,root,root) %{_libdir}/kde4/plugins/marble/MarbleStarsPlugin.so -%attr(755,root,root) %{_libdir}/kde4/plugins/marble/MarbleCrosshairsPlugin.so -%attr(755,root,root) %{_libdir}/kde4/plugins/marble/MarbleGeoDataPlugin.so %attr(755,root,root) %{_libdir}/kde4/plugins/marble/NavigationFloatItem.so +%attr(755,root,root) %{_libdir}/kde4/plugins/marble/CrosshairsPlugin.so +%attr(755,root,root) %{_libdir}/kde4/plugins/marble/GeoRendererPlugin.so +%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/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/Wikipedia.so %dir %{_datadir}/apps/marble_part %{_datadir}/apps/marble @@ -832,11 +865,40 @@ * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.35 2009/07/12 03:24:34 arekm -- release 2 +Revision 1.36 2009/07/29 20:44:07 shadzik +- merged from DEVEL + +Revision 1.33.2.9 2009/07/29 20:43:58 shadzik +- 4.3.0 + +Revision 1.33.2.8 2009/07/22 11:31:15 shadzik +- 4.3rc3 + +Revision 1.33.2.7 2009/07/09 19:04:54 paszczus +- updated to 4.2.96 + +Revision 1.33.2.6 2009/07/04 15:33:18 shadzik +- fix --target build + +Revision 1.33.2.5 2009/06/30 09:03:42 shadzik +- 4.3 RC1 +- kill xplanet BR + +Revision 1.33.2.4 2009/06/11 15:28:32 paszczus +- step subpackage is back +- added %files; rel 1 + +Revision 1.33.2.3 2009/06/11 14:51:36 paszczus +- updated to 4.2.91 +- added BRs: eigen-devel, gsl-devel, eigen-devel +- NFY, see TODO + +Revision 1.33.2.2 2009/05/30 14:57:40 paszczus +- updated to 4.2.88 -Revision 1.34 2009/06/03 20:23:47 shadzik -- 4.2.4 +Revision 1.33.2.1 2009/05/27 11:14:15 paszczus +- updated to 4.2.87 +- step subpackage dropped Revision 1.33 2009/05/08 15:02:04 shadzik - release 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeedu/kde4-kdeedu.spec?r1=1.35&r2=1.36&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
