Hello community, here is the log from the commit of package kdeedu4 for openSUSE:Factory checked in at Tue Dec 14 10:56:52 CET 2010. -------- --- KDE/kdeedu4/kdeedu4.changes 2010-11-19 17:13:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4.changes 2010-12-03 17:12:17.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Dec 3 17:11:38 CET 2010 - dmueller@suse.de + +- update to 4.5.85 + * KDE 4.6 Beta2 + * Final Beta before RC, various fixes from Beta1 + * no upstream changelog available. + + +------------------------------------------------------------------- +Sun Nov 28 10:12:12 UTC 2010 - tittiatcoke@gmail.com + +- Added patch to avoid building rocs on openSUSE 11.1 and 11.2 + +------------------------------------------------------------------- kdeedu4-noarch.changes: same change calling whatdependson for head-i586 Old: ---- kdeedu-4.5.80.tar.bz2 New: ---- kdeedu-4.5.85.tar.bz2 no-build_for_rocs.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu4-noarch.spec ++++++ --- /var/tmp/diff_new_pack.jZ3i41/_old 2010-12-14 10:44:08.000000000 +0100 +++ /var/tmp/diff_new_pack.jZ3i41/_new 2010-12-14 10:44:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4-noarch (Version 4.5.80) +# spec file for package kdeedu4-noarch (Version 4.5.85) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,7 +27,7 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.5.80 +Version: 4.5.85 Release: 1 Source0: kdeedu-%version.tar.bz2 Patch0: 4_6_BRANCH.diff ++++++ kdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.jZ3i41/_old 2010-12-14 10:44:08.000000000 +0100 +++ /var/tmp/diff_new_pack.jZ3i41/_new 2010-12-14 10:44:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4 (Version 4.5.80) +# spec file for package kdeedu4 (Version 4.5.85) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -44,13 +44,16 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.5.80 +Version: 4.5.85 Release: 1 Source0: kdeedu-%version.tar.bz2 Patch0: 4_6_BRANCH.diff Patch1: marble-designer-plugin.diff Patch2: desktop-files.diff Patch3: kstars-skip-data.diff +%if %suse_version < 1130 +Patch4: no-build_for_rocs.diff +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Requires: libkdeedu4 @@ -74,7 +77,9 @@ Suggests: marble Suggests: kalgebra Suggests: step +%if %suse_version > 1120 Suggests: rocs +%endif Suggests: cantor %description @@ -93,6 +98,9 @@ %patch1 %patch2 %patch3 +%if %suse_version < 1130 +%patch4 -p0 +%endif %build %ifarch ppc ppc64 @@ -132,7 +140,9 @@ %create_subdir_filelist -d kwordquiz %create_subdir_filelist -d step %create_subdir_filelist -d cantor +%if %suse_version > 1120 %create_subdir_filelist -d rocs -v rocs.devel +%endif cd .. sed -ri s,.*libsbigudrv.so.*,, filelists/kstars sed -ri s,.*/usr/share/kde4/apps/marble/data.*,, filelists/marble @@ -167,7 +177,9 @@ %endif %suse_update_desktop_file kanagram Education Languages %suse_update_desktop_file cantor Education Math +%if %suse_version > 1120 %suse_update_desktop_file rocs Education Math +%endif %kde_post_install # no conflict with sbig package # rm $RPM_BUILD_ROOT/usr/%_lib/libsbigudrv.* @@ -282,6 +294,10 @@ %doc COPYING COPYING.DOC README %dir %_kde4_appsdir/marble_part %dir %_kde4_modulesdir/plugins/marble +%dir %_kde4_modulesdir/plugins/marble/org +%dir %_kde4_modulesdir/plugins/marble/org/kde +%dir %_kde4_modulesdir/plugins/marble/org/kde/edu +%dir %_kde4_modulesdir/plugins/marble/org/kde/edu/marble %package -n marble-devel License: LGPLv2.1+ @@ -795,6 +811,8 @@ %dir %_kde4_appsdir/cantorpart %dir %_kde4_servicesdir/cantor +%if %suse_version > 1120 + %package -n rocs License: GPLv2+ Group: Amusements/Teaching/Mathematics @@ -832,6 +850,8 @@ %defattr(-,root,root) %dir /usr/include/rocs +%endif + %files -f filelists/exclude %defattr(-,root,root) %doc COPYING COPYING.DOC README ++++++ kdeedu-4.5.80.tar.bz2 -> kdeedu-4.5.85.tar.bz2 ++++++ KDE/kdeedu4/kdeedu-4.5.80.tar.bz2 /mounts/work_src_done/STABLE/kdeedu4/kdeedu-4.5.85.tar.bz2 differ: byte 11, line 1 ++++++ no-build_for_rocs.diff ++++++ --- CMakeLists.txt 2010-11-19 11:51:46.000000000 +0100 +++ CMakeLists.txt 2010-11-19 11:51:46.000000000 +0100 @@ -85,10 +85,6 @@ macro_optional_add_subdirectory(marble) macro_optional_add_subdirectory(kalgebra) macro_optional_add_subdirectory(cantor) -if(NOT MSVC) - # boost 1.44 / std::isspace() problem - macro_optional_add_subdirectory(rocs) -endif(NOT MSVC) 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 and KStars.") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org