commit kdebase4-workspace for openSUSE:Factory
Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Thu Feb 25 02:29:40 CET 2010. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-02-09 22:54:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-02-25 02:29:11.194478000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 14 21:00:02 UTC 2010 - llunak@novell.com + +- google-gadgets no longer build for 11.0, disable support + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.PxPlJ2/_old 2010-02-25 02:29:24.000000000 +0100 +++ /var/tmp/diff_new_pack.PxPlJ2/_new 2010-02-25 02:29:24.000000000 +0100 @@ -30,7 +30,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.4.0 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.PxPlJ2/_old 2010-02-25 02:29:24.000000000 +0100 +++ /var/tmp/diff_new_pack.PxPlJ2/_new 2010-02-25 02:29:24.000000000 +0100 @@ -21,7 +21,10 @@ BuildRequires: NetworkManager-devel bluez-devel libkde4-devel libqimageblitz-devel BuildRequires: libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel BuildRequires: audit-devel libQtWebKit-devel libsoprano-devel pam-devel python soprano-backend-redland -BuildRequires: google-gadgets-devel libkdepimlibs4-devel libknotificationitem-devel +BuildRequires: libkdepimlibs4-devel libknotificationitem-devel +%if %suse_version > 1100 +BuildRequires: google-gadgets-devel +%endif %if %suse_version > 1030 BuildRequires: ConsoleKit-devel gpsd-devel liblazy-devel %ifnarch s390 s390x @@ -37,7 +40,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.4.0 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd Source2: titlebar_decor.png @@ -98,7 +101,10 @@ %else Requires: kdebase4-workspace-ksysguardd = %version %endif -Suggests: kdm kdebase4-wallpapers kdebase4-workspace-google-gadgets +Suggests: kdm kdebase4-wallpapers +%if %suse_version > 1100 +Suggests: kdebase4-workspace-google-gadgets +%endif %define debug_package_requires %name = %version-%release kdelibs4-debuginfo Provides: kdebase3:/opt/kde3/bin/kicker Provides: powerdevil = 1.4.1 @@ -208,7 +214,7 @@ sed -ri "s,.*%{_kde_share_dir}/apps/kdm/themes/oxygen.*,," filelists/kdm sed -ri "s,.*%{_kde_share_dir}/apps/kdm/pics.*,," filelists/kdm ls -1 $RPM_BUILD_ROOT/usr/share/wallpapers/ | while read wallpaper; \ - do test "$wallpaper" = "Air" -o ! -d "$RPM_BUILD_ROOT/usr/share/wallpapers/$wallpaper" \ + do test "$wallpaper" = "Ethais" -o ! -d "$RPM_BUILD_ROOT/usr/share/wallpapers/$wallpaper" \ || rm -r "$RPM_BUILD_ROOT/usr/share/wallpapers/$wallpaper"; done mkdir -p $RPM_BUILD_ROOT/etc #mv $RPM_BUILD_ROOT/usr/etc/systemsettingsrc $RPM_BUILD_ROOT/etc/ @@ -269,7 +275,7 @@ %_kde4_appsdir/kwin/cubecap.png %_kde4_appsdir/kwin/titlebar_decor.png %_kde4_appsdir/ksplash/Themes/Default -%_kde4_wallpapersdir/Air +%_kde4_wallpapersdir/Ethais %package -n kdm-branding-upstream Summary: KDE login and display manager - upstream branding @@ -353,6 +359,8 @@ %config(noreplace) %_kde4_sysconfdir/ksysguarddrc %_kde_config_dir/ksysguard.knsrc +%if %suse_version > 1100 + %package google-gadgets License: GPLv2+ Group: System/GUI/KDE @@ -378,6 +386,7 @@ %doc COPYING COPYING.DOC README %_kde4_modulesdir/plasma_*_ggl.so %_kde4_servicesdir/plasma-*-googlegadgets.desktop +%endif %package -n kwin License: GPLv2+ @@ -621,7 +630,9 @@ %_kde4_modulesdir/libexec/kscreenlocker %_kde4_modulesdir/libexec/fontinst_helper %_kde4_modulesdir/libexec/test_kcm_xinerama +%if %suse_version > 1100 %exclude %_kde4_modulesdir/plasma_*_ggl.so +%endif %_kde4_modulesdir/plasma_*.so %_kde4_modulesdir/plugins/designer/ksysguardwidgets.so %_kde4_modulesdir/plugins/designer/ksignalplotterwidgets.so @@ -953,6 +964,6 @@ %_kde4_servicesdir/kded/randrmonitor.desktop %_kde4_libdir/libsystemsettingsview.so.1 %exclude %_kde4_appsdir/ksplash/Themes/Default -%exclude %_kde4_wallpapersdir/Air +%exclude %_kde4_wallpapersdir/Ethais %changelog ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.PxPlJ2/_old 2010-02-25 02:29:24.000000000 +0100 +++ /var/tmp/diff_new_pack.PxPlJ2/_new 2010-02-25 02:29:24.000000000 +0100 @@ -29,7 +29,7 @@ Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ Version: 4.4.0 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} ++++++ 4_4_BRANCH.diff ++++++ ++++ 3547 lines (skipped) ++++ between KDE/kdebase4-workspace/4_4_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_4_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de