Hello community, here is the log from the commit of package kdebase4-workspace checked in at Wed Nov 21 18:23:02 CET 2007. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2007-11-02 01:11:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2007-11-21 18:22:18.693482000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 21 13:43:04 CET 2007 - dmueller@suse.de + +- reenable OpenGL support + +------------------------------------------------------------------- +Tue Nov 20 22:57:23 CET 2007 - dmueller@suse.de + +- update to 3.96.0 + +------------------------------------------------------------------- @@ -4 +14 @@ -- updaste to 3.95.1 +- updaste to 3.95.1 kdebase4-workspace.changes: same change Old: ---- kdebase-workspace-3.95.1.tar.bz2 New: ---- kdebase-workspace-3.96.0.tar.bz2 r739332.diff r739357.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.H14255/_old 2007-11-21 18:22:27.000000000 +0100 +++ /var/tmp/diff_new_pack.H14255/_new 2007-11-21 18:22:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 3.95.1) +# spec file for package kdebase4-wallpapers (Version 3.96.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,7 +20,7 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 3.95.1 +Version: 3.96.0 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,6 +57,10 @@ %doc COPYING COPYING-DOCS README /usr/share/wallpapers %changelog +* Wed Nov 21 2007 - dmueller@suse.de +- reenable OpenGL support +* Tue Nov 20 2007 - dmueller@suse.de +- update to 3.96.0 * Thu Nov 01 2007 - dmueller@suse.de - updaste to 3.95.1 * Tue Oct 30 2007 - dmueller@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.H14255/_old 2007-11-21 18:22:27.000000000 +0100 +++ /var/tmp/diff_new_pack.H14255/_new 2007-11-21 18:22:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 3.95.1) +# spec file for package kdebase4-workspace (Version 3.96.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,9 +21,9 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 3.95.1 +Version: 3.96.0 Release: 1 -%define rversion 3.95.1 +%define rversion 3.96.0 Source0: kdebase-workspace-%rversion.tar.bz2 Source90: _upstream Source91: kdebase4-workspace-rpmlintrc @@ -31,6 +31,8 @@ Patch1: dotkde4.diff Patch3: show-runtime-only-in-kde.diff Patch4: plasma-pager.diff +Patch5: r739332.diff +Patch6: r739357.diff Requires: kdebase4-runtime Conflicts: yast2-theme-NLD Suggests: kdebase4-ksysguardd @@ -52,6 +54,8 @@ %setup -q -n kdebase-workspace-%rversion %patch1 %patch3 +%patch5 +%patch6 #%patch4 %build @@ -146,6 +150,7 @@ /usr/%_lib/kconf_update_bin/kwin_update_default_rules /usr/%_lib/kconf_update_bin/kwin_update_window_settings /usr/%_lib/kde4/kcm_kwindecoration.so +/usr/%_lib/kde4/kcm_kwindesktop.so /usr/%_lib/kde4/kcm_kwinoptions.so /usr/%_lib/kde4/kcm_kwinrules.so /usr/%_lib/kde4/kwin3_b2.so @@ -156,12 +161,12 @@ /usr/%_lib/kde4/kwin3_quartz.so /usr/%_lib/kde4/kwin3_web.so /usr/%_lib/kde4/kwin3_laptop.so +/usr/%_lib/kde4/kwin3_oxygen.so /usr/%_lib/kde4/kwin_b2_config.so /usr/%_lib/kde4/kwin_keramik_config.so /usr/%_lib/kde4/kwin_plastik_config.so /usr/%_lib/kde4/kwin_quartz_config.so /usr/%_lib/kde4/kwin_modernsys_config.so -/usr/%_lib/kde4/kwin3_oxy.so /usr/%_lib/kde4/kwin3_kde2.so /usr/%_lib/kde4/kwin_kde2_config.so /usr/%_lib/kde4/kcm_kwin4_effect_builtins.so @@ -178,6 +183,7 @@ %_kde_share_dir/config.kcfg/kwin.kcfg /usr/share/dbus-1/interfaces/org.kde.KWin.xml /usr/share/icons/crystalsvg/*/apps/kwin.* +/usr/share/icons/crystalsvg/*/apps/kcmkwm.* %_kde_share_dir/services/kwinactions.desktop %_kde_share_dir/services/kwinadvanced.desktop %_kde_share_dir/services/kwindecoration.desktop @@ -286,11 +292,10 @@ /etc/kde4/kdm/Xstartup /etc/kde4/kdm/Xwilling /etc/kde4/kdm/backgroundrc -/etc/kde4/kdm/kdmrc +%config /etc/kde4/kdm/kdmrc %_kde_share_dir/apps/doc/kdm/README %_kde_share_dir/apps/kdm %_kde_share_dir/services/kdm.desktop -/usr/share/icons/crystalsvg/*/apps/kdmconfig.* %config %_kde_config_dir/kdm.knsrc %files @@ -307,7 +312,6 @@ /usr/bin/khotkeys /usr/bin/klipper /usr/bin/kmenuedit -#/usr/bin/kickoff /usr/bin/krandom.kss /usr/bin/krandrtray /usr/bin/krdb @@ -323,7 +327,6 @@ /usr/bin/kxkb /usr/bin/startkde /usr/bin/plasma -/usr/bin/kickoff /usr/bin/plasmaengineexplorer /usr/bin/plasmoidviewer /usr/bin/kdostartupconfig4 @@ -361,6 +364,8 @@ %_kde_share_dir/services/plasma-engine-tasks.desktop %_kde_share_dir/services/plasma-pager-default.desktop %_kde_share_dir/services/plasma-runner-search.desktop +%_kde_share_dir/services/plasma-runner-bookmarks.desktop +%_kde_share_dir/services/desktop.desktop %_kde_share_dir/services/plasma-runner-calculator.desktop %_kde_share_dir/services/plasma-runner-webshortcuts.desktop %_kde_share_dir/apps/plasmoidviewer @@ -395,10 +400,10 @@ #/usr/%_lib/kde4/klipper_panelapplet.so /usr/%_lib/kde4/krunner_calculatorrunner.so /usr/%_lib/kde4/krunner_searchrunner.so +/usr/%_lib/kde4/krunner_bookmarksrunner.so /usr/%_lib/kde4/kstyle_keramik_config.so /usr/%_lib/kde4/kcm_kwincompositing.so /usr/%_lib/kde4/kwin4_effect_builtins.so -/usr/%_lib/kde4/kwin4_effect_tests.so #/usr/%_lib/kde4/kxkb_panelapplet.so /usr/%_lib/kde4/libexec/test_kcm_xinerama /usr/%_lib/kde4/plugins/designer/ksysguardwidgets.so @@ -462,62 +467,10 @@ %_kde_share_dir/config.kcfg/kscreensaversettings.kcfg /usr/share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml /usr/share/dbus-1/interfaces/org.kde.krunner.Interface.xml +/usr/share/dbus-1/interfaces/org.kde.screensaver.xml /usr/share/dbus-1/interfaces/org.kde.KSMServerInterface.xml /usr/share/desktop-directories /usr/share/kde4/services/colors.desktop -/usr/share/icons/crystalsvg/*/apps/colors.* -/usr/share/icons/crystalsvg/*/apps/access.* -/usr/share/icons/crystalsvg/*/apps/background.* -/usr/share/icons/crystalsvg/*/apps/bell.* -/usr/share/icons/crystalsvg/*/apps/clock.* -/usr/share/icons/crystalsvg/*/apps/date.* -/usr/share/icons/crystalsvg/*/apps/edu_languages.* -/usr/share/icons/crystalsvg/*/apps/edu_mathematics.* -/usr/share/icons/crystalsvg/*/apps/edu_miscellaneous.* -/usr/share/icons/crystalsvg/*/apps/edu_science.* -/usr/share/icons/crystalsvg/*/apps/energy_star.* -/usr/share/icons/crystalsvg/*/apps/fonts.* -/usr/share/icons/crystalsvg/*/apps/ieee1394.* -/usr/share/icons/crystalsvg/*/apps/input_devices_settings.* -/usr/share/icons/crystalsvg/*/apps/kcmdevices.* -/usr/share/icons/crystalsvg/*/apps/kcmkwm.* -/usr/share/icons/crystalsvg/*/apps/kcmmemory.* -/usr/share/icons/crystalsvg/*/apps/kcmopengl.* -/usr/share/icons/crystalsvg/*/apps/kcmpartitions.* -/usr/share/icons/crystalsvg/*/apps/kcmpci.* -/usr/share/icons/crystalsvg/*/apps/kcmprocessor.* -/usr/share/icons/crystalsvg/*/apps/kcmscsi.* -/usr/share/icons/crystalsvg/*/apps/kcmsound.* -/usr/share/icons/crystalsvg/*/apps/kcmx.* -/usr/share/icons/crystalsvg/*/apps/key_bindings.* -/usr/share/icons/crystalsvg/*/apps/keyboard_layout.* -/usr/share/icons/crystalsvg/*/apps/kscreensaver.* -/usr/share/icons/crystalsvg/*/apps/ksysguard.* -/usr/share/icons/crystalsvg/*/apps/kthememgr.* -/usr/share/icons/crystalsvg/*/apps/package.* -/usr/share/icons/crystalsvg/*/apps/package_application.* -/usr/share/icons/crystalsvg/*/apps/package_applications.* -/usr/share/icons/crystalsvg/*/apps/package_development.* -/usr/share/icons/crystalsvg/*/apps/package_editors.* -/usr/share/icons/crystalsvg/*/apps/package_edutainment.* -/usr/share/icons/crystalsvg/*/apps/package_favourite.* -/usr/share/icons/crystalsvg/*/apps/package_games.* -/usr/share/icons/crystalsvg/*/apps/package_games_arcade.* -/usr/share/icons/crystalsvg/*/apps/package_games_board.* -/usr/share/icons/crystalsvg/*/apps/package_games_card.* -/usr/share/icons/crystalsvg/*/apps/package_games_strategy.* -/usr/share/icons/crystalsvg/*/apps/package_graphics.* -/usr/share/icons/crystalsvg/*/apps/package_multimedia.* -/usr/share/icons/crystalsvg/*/apps/package_network.* -/usr/share/icons/crystalsvg/*/apps/package_settings.* -/usr/share/icons/crystalsvg/*/apps/package_system.* -/usr/share/icons/crystalsvg/*/apps/package_toys.* -/usr/share/icons/crystalsvg/*/apps/package_utilities.* -/usr/share/icons/crystalsvg/*/apps/package_wordprocessing.* -/usr/share/icons/crystalsvg/*/apps/randr.* -/usr/share/icons/crystalsvg/*/apps/style.* -/usr/share/icons/crystalsvg/*/apps/usb.* -/usr/share/icons/crystalsvg/*/apps/xapp.* /usr/share/icons/hicolor/*/apps/khotkeys.* /usr/share/icons/hicolor/*/apps/kmenuedit.* /usr/share/icons/hicolor/*/apps/ksplash.* @@ -584,7 +537,6 @@ #/usr/share/kde4/services/kxkb_part.desktop /usr/share/kde4/apps/solid /usr/share/applications/kde4/systemsettings.desktop -/usr/share/desktop-directories/kde-education.directory /usr/share/icons/crystalsvg/*/apps/networkmanager.* /usr/share/icons/hicolor/*/apps/systemsettings.* /usr/share/kde4/apps/solidfakebluetoothbackend @@ -640,6 +592,10 @@ %doc %lang(en) /usr/share/doc/kde/HTML/en/ksysguard %doc %lang(en) /usr/share/doc/kde/HTML/en/kxkb %changelog +* Wed Nov 21 2007 - dmueller@suse.de +- reenable OpenGL support +* Tue Nov 20 2007 - dmueller@suse.de +- update to 3.96.0 * Thu Nov 01 2007 - dmueller@suse.de - updaste to 3.95.1 * Tue Oct 30 2007 - dmueller@suse.de ++++++ kdebase-workspace-3.95.1.tar.bz2 -> kdebase-workspace-3.96.0.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-3.95.1.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-3.96.0.tar.bz2 differ: byte 11, line 1 ++++++ r739332.diff ++++++ ------------------------------------------------------------------------ r739332 | neundorf | 2007-11-20 22:39:53 +0100 (Tue, 20 Nov 2007) | 5 lines -check for OpenGL in workspace, otherwise opengl will be disabled when building just workspace (without kdebase) Alex ------------------------------------------------------------------------ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 739331) +++ CMakeLists.txt (revision 739332) @@ -3,14 +3,15 @@ project(KDEBASE_WORKSPACE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) +include (MacroLibrary) + #search packages used by KDE find_package(KDE4 REQUIRED) find_package(Strigi REQUIRED) find_package(Blitz REQUIRED) +macro_optional_find_package(OpenGL) + include (KDE4Defaults) -include (MacroLibrary) -include (MacroOptionalFindPackage) -include(MacroOptionalAddSubdirectory) include(ConfigureChecks.cmake) ++++++ r739357.diff ++++++ ------------------------------------------------------------------------ r739357 | mueller | 2007-11-20 23:10:18 +0100 (Tue, 20 Nov 2007) | 2 lines fix build ------------------------------------------------------------------------ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 739356) +++ CMakeLists.txt (revision 739357) @@ -3,16 +3,16 @@ project(KDEBASE_WORKSPACE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) -include (MacroLibrary) #search packages used by KDE find_package(KDE4 REQUIRED) find_package(Strigi REQUIRED) find_package(Blitz REQUIRED) -macro_optional_find_package(OpenGL) +include (MacroLibrary) include (KDE4Defaults) +macro_optional_find_package(OpenGL) include(ConfigureChecks.cmake) configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org