Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2013-04-29 13:59:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2013-04-22 14:31:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-04-29 13:59:02.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Apr 26 15:32:44 UTC 2013 - hrvoje.senjan@gmail.com + +- Remove plasma-notifications-kill-timer.diff, that was fix for + kde#230740, but it is commited upstream 3 years ago +- Remove unused patches: kwin-suse.diff, kdm-audit-log.diff, + systemsettings-root-kcm.diff, pam-translate.diff and + kdm-suspend-hal.diff (which used HAL, but we migrated away from + it long ago) +- Group patches wheter they are for KDM or Workspace components +- Remove checks and obsoletes/provides for no longer supported versions +- Fix rpmlint warnings: devel files shipping in the main package and + kdm missing logrotate dependency +- Remove not needed kdesud %verify checks +- Added %kde4_runtime_requires to ksysguard and plasma-calendar packages +- Annotate existing patches where possible + +------------------------------------------------------------------- Old: ---- kdm-audit-log.diff kdm-suspend-hal.diff kwin-suse.diff pam-translate.diff plasma-notifications-kill-timer.diff systemsettings-root-kcm.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.zXH9ov/_old 2013-04-29 13:59:08.000000000 +0200 +++ /var/tmp/diff_new_pack.zXH9ov/_new 2013-04-29 13:59:08.000000000 +0200 @@ -32,11 +32,7 @@ %if !%{with_systemd} BuildRequires: ConsoleKit-devel %endif -%if 0%{?suse_version} > 1140 BuildRequires: NetworkManager-devel > 0.8.997 -%else -BuildRequires: NetworkManager-devel < 0.8.5 -%endif BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: libQtWebKit-devel @@ -45,9 +41,7 @@ BuildRequires: libkde4-devel >= %{version} BuildRequires: libkdepimlibs4-devel >= %{version} BuildRequires: liblazy-devel -%if %suse_version > 1110 BuildRequires: libpolkit-qt-1-devel -%endif BuildRequires: libprison-devel BuildRequires: libqalculate-devel BuildRequires: libqimageblitz-devel @@ -79,85 +73,92 @@ Source6: kdm-logrotate Source7: ksysguardd.service Source91: %{name}-rpmlintrc -Patch8: kwin-suse.diff -Patch18: startkde.diff -Patch60: kdm-audit-log.diff -Patch62: kdm-cope-with-new-grub.diff -Patch63: kdm-relaxed-auth.diff -Patch64: kdm-suspend-hal.diff -%if %suse_version > 1210 -Patch65: kdm-sysconfig-values.diff -%endif -Patch66: kdm-wordbreak.diff -Patch67: kdm-remove-duplicated-sessions.diff -Patch68: kdm-make_it_cool.diff -Patch69: kdm-all-users-nopass.diff -Patch70: same-pam-generic-classic.diff -Patch71: kdm-kdmconf.diff -Patch77: systemsettings-desktop.diff -Patch82: rotate-wacom-pointers.diff -Patch88: kde4-migrate.diff -Patch94: systemsettings-root-kcm.diff -Patch98: kdm-dont-grab-mouse.diff -#Subject: Increase the time KDM waits for X to start up -#From: Lubos Lunak -#Patch-upstream: no -#Bug: bnc#462478 -Patch99: kdm-long-xserver-timeout.diff -Patch104: plasma-branding-defaults-applets.diff -Patch106: plasma-dashboard-leave.diff -Patch107: plasma-kickoff-newly-collapsing.diff -Patch108: plasma-panel-resize-hint.diff -Patch123: kdm-fix-generic-greeter.diff -Patch124: kdm-fix-labelcolors.diff -Patch125: pam-translate.diff -Patch126: dont-install-solid-netbackends.diff -Patch127: krunner-no-italics.diff -Patch201: plasma-notifications-kill-timer.diff -Patch202: plasma-disable-networkmanager.diff +## KDM patches +# PATCH-FIX-OPENSUSE kdm-cope-with-new-grub.diff -- Don't look for grub-set-default, we won't need it (bnc#771545) +Patch1: kdm-cope-with-new-grub.diff +# PATCH-FIX-OPENSUSE In O:F since r24 +Patch2: kdm-relaxed-auth.diff +Patch3: kdm-make_it_cool.diff +# PATCH-FIX-OPENSUSE kdm-sysconfig-values.diff -- Adds syconfig support to KDM +Patch4: kdm-sysconfig-values.diff +# PATCH-FIX-OPENSUSE kdm-wordbreak.diff -- Wraps the username if it's too long +Patch5: kdm-wordbreak.diff +# PATCH-FIX-OPENSUSE kdm-remove-duplicated-sessions.diff -- Removes duplicate sessions from KDM session list +Patch6: kdm-remove-duplicated-sessions.diff +# PATCH-FIX-OPENSUSE kdm-all-users-nopass.diff -- Allows the setting which enables users to login without password +Patch7: kdm-all-users-nopass.diff +# PATCH-FIX-OPENSUSE kdm-kdmconf.diff -- Cleans up the old kdmrc file +Patch8: kdm-kdmconf.diff +# PATCH-FIX-OPENSUSE kdm-dont-grab-mouse.diff -- Revert changes in KDM that made it also grab the mouse, which +# prevents xvkbd from working on tablet PCs (bnc#445726) +Patch9: kdm-dont-grab-mouse.diff +# PATCH-FIX-OPENSUSE kdm-long-xserver-timeout.diff -- Increases the time KDM waits for X to start up (bnc#462478) +Patch10: kdm-long-xserver-timeout.diff +# PATCH-FIX-OPENSUSE These three patches are workarounds for fingerprint support (bnc#533189) +Patch11: kdm-fix-generic-greeter.diff +Patch12: kdm-fix-labelcolors.diff +Patch13: same-pam-generic-classic.diff # PATCH-FIX-OPENSUSE kdm_systemd_shutdown.patch Avoid the situation where systemd would kill KDM # which prevents reboot/shutdown (Fedora Patch) -Patch213: kdm_systemd_shutdown.patch +Patch14: kdm_systemd_shutdown.patch +# Patch from Fedora to enable plymouth support in KDM. +# Patch is based on the changes within GDM to detect running plymouth +# and issue a quit to the plymouth daemon +Patch15: kdm_plymouth.patch +## Workspace patches +# PATCH-FIX-OPENSUSE startkde.diff -- Injects branded startupconfigkeys to users $KDEHOME, and adds %datadir/kde4/env +# to list of read enviroments +Patch16: startkde.diff +# PATCH-FIX-OPENSUSE kde4-migrate.diff -- Migrates config from .kde to .kde4 +Patch17: kde4-migrate.diff +# PATCH-FIX-OPENSUSE systemsettings-desktop.diff -- Changes name of System Settings to Configure Desktop +Patch18: systemsettings-desktop.diff +# PATCH-FIX-OPENSUSE rotate-wacom-pointers.diff -- Adds support to krandrtray that rotates wacom pointers when the display is rotated +Patch19: rotate-wacom-pointers.diff +# PATCH-FIX-OPENSUSE plasma-branding-defaults-applets.diff -- Brands kickoff, so it uses branded start-here icon, and adds +# several applications to SystemApplications category +Patch20: plasma-branding-defaults-applets.diff +# PATCH-FIX-OPENSUSE plasma-dashboard-leave.diff -- Makes possible to leave dashboard view with just left-click +Patch21: plasma-dashboard-leave.diff +# PATCH-FIX-OPENSUSE plasma-kickoff-newly-collapsing.diff -- Adds several features to kickoff, e.g. recently installed category, +# and reduced menu length +Patch22: plasma-kickoff-newly-collapsing.diff +# PATCH-FIX-OPENSUSE plasma-panel-resize-hint.diff -- Displays pixel size when resizing panel +Patch23: plasma-panel-resize-hint.diff +# PATCH-FIX-OPENSUSE dont-install-solid-netbackends.diff -- Excludes redundant Network Management backends from building +Patch24: dont-install-solid-netbackends.diff +# PATCH-FIX-OPENSUSE krunner-no-italics.diff -- Change italic krunner result subtext to be smaller instead of italic (kde#307344) +Patch25: krunner-no-italics.diff +# PATCH-FIX-OPENSUSE plasma-disable-networkmanager.diff -- Makes it possible to disable it on KDE start depending on sysconfig +Patch26: plasma-disable-networkmanager.diff %if %{with_systemd} # PATCH-FIX-UPSTREAM systemd-session-management-support-in-the-workspace.patch # This patch rewrites the reboot/shutdown code within workspace so that it works with systemd. -Patch214: systemd-session-management-support-in-the-workspace.patch +Patch27: systemd-session-management-support-in-the-workspace.patch %endif -# Patch from Fedora to enable plymouth support in KDM. -# Patch is based on the changes within GDM to detect running plymouth -# and issue a quit to the plymouth daemon -Patch400: kdm_plymouth.patch -# PATCH-FIX-OPENSUSE opensuse-homepage.diff -Patch401: opensuse-homepage.diff +# PATCH-FIX-OPENSUSE opensuse-homepage.diff -- Makes kickoff use openSUSE homepage as default +Patch28: opensuse-homepage.diff # PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to have some openSUSE distro info in kinfocenter) -Patch402: opensuse-kinfocenter.diff +Patch29: opensuse-kinfocenter.diff # PATCH-FIX-OPENSUSE storage.diff (created by Alin M. Elena to add unique names for partitions in kinfocenter) -Patch403: storage.diff -# PATCH-FIX-OPENSUSE pager.diff Use plasma theme color for pager text -Patch404: pager.diff +Patch30: storage.diff +# PATCH-FIX-OPENSUSE pager.diff -- Use plasma theme color for pager text +Patch31: pager.diff # PATCH-FIX-UPSTREAM fix-plasma-theme-workaround-tabbox.patch -- Fix tabbox drawing (exposed in default openSUSE 12.3 plasma theme) -Patch405: fix-plasma-theme-workaround-tabbox.patch +Patch32: fix-plasma-theme-workaround-tabbox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 1200 Requires: %{name}-branding = %{version} -%else -Requires: %{name}-branding -%endif Requires: %{name}-ksysguardd = %{version} Requires: %{name}-liboxygenstyle = %{version} # Requires /etc/xdg/menus/applications.menu (bnc#754104) Requires: desktop-data-openSUSE Requires: kactivities4 >= %{version} Requires: kde4-kgreeter-plugins = %{version} -%if %suse_version > 1110 Requires: polkit-kde-agent-1 Requires: polkit-kde-kcmmodules-1 -%endif Requires: windowmanager -%if %suse_version > 1210 # patch kdm-sysconfig-values.diff requires /var/lib/xdm/authdir/authfiles (bnc#784212) Requires: xdm -%endif %if %suse_version > 1220 Requires: xmessage Requires: xprop @@ -173,24 +174,6 @@ Requires(pre): permissions %define debug_package_requires %{name} = %{version}-%{release} kdelibs4-debuginfo Provides: kdebase3:/opt/kde3/bin/kicker -Provides: powerdevil = 1.4.1 -Obsoletes: powerdevil < 1.4.1 -Provides: powerdevil-lang = 1.4.1 -Obsoletes: powerdevil-lang < 1.4.1 -Provides: kpowersave = 0.7.3_svn3167 -Obsoletes: kpowersave < 0.7.3_svn3167 -Provides: kpowersave-lang = 0.7.3_svn3167 -Obsoletes: kpowersave-lang < 0.7.3_svn3167 -Provides: kde4-plasmoid-quicklauncher = 0.4 -Obsoletes: kde4-plasmoid-quicklauncher < 0.4 -Provides: PolicyKit-kde = 0.2.0 -Obsoletes: PolicyKit-kde < 0.2.0 -Provides: PolicyKit-kde-lang = 11.2 -Obsoletes: PolicyKit-kde-lang < 11.2 -# kdeaccessibility package used to contain Zion -# color scheme which is now in -workspace -Provides: kdeaccessibility = %{version} -Obsoletes: kdeaccessibility < %{version} #Ktouchpadenabler is now part of workspace Provides: ktouchpadenabler = %{version} Obsoletes: ktouchpadenabler < %{version} @@ -227,8 +210,6 @@ Provides: kdm-branding = %{version} Requires(pre): %fillup_prereq Supplements: packageand(kdm:branding-upstream) -Provides: kde4-kdm-branding-upstream = 4.3.0 -Obsoletes: kde4-kdm-branding-upstream < 4.3.0 Conflicts: otherproviders(kdm-branding) %description -n kdm-branding-upstream @@ -239,6 +220,7 @@ Summary: KDE base package: ksysguard daemon Group: System/GUI/KDE Requires(pre): %insserv_prereq +%kde4_runtime_requires %description ksysguardd This package contains the ksysguard daemon and application. @@ -251,14 +233,8 @@ Group: System/GUI/KDE Provides: windowmanager %kde4_runtime_requires -%if %suse_version > 1200 Requires: %{name}-branding = %{version} -%else -Requires: %{name}-branding -%endif -Provides: kde4-kwin = 4.3.0 Provides: kdebase3:/opt/kde3/bin/kwin -Obsoletes: kde4-kwin < 4.3.0 %description -n kwin KWin is the window manager of the K desktop environment. @@ -290,21 +266,16 @@ %package -n kdm Summary: KDE login and display manager Group: System/GUI/KDE -%if %suse_version > 1200 Requires: kdm-branding = %{version} -%else -Requires: kdm-branding -%endif %if !%{with_systemd} Requires: ConsoleKit-x11 %endif Requires: kde4-kgreeter-plugins = %{version} +Requires: logrotate Requires: pam-config Requires: xorg-x11-server Provides: kdebase3-kdm = 3.5.1 Obsoletes: kdebase3-kdm < 3.5.1 -Provides: kde4-kdm = 4.3.0 -Obsoletes: kde4-kdm < 4.3.0 %kde4_runtime_requires %description -n kdm @@ -326,6 +297,7 @@ Supplements: packageand(akonadi-runtime:kdebase4-workspace) Requires: %{name} = %{version} Recommends: akonadi-runtime +%kde4_runtime_requires %description plasma-calendar This packages contains the calendar Plasma engine and applet, which are based on Akonadi. @@ -341,56 +313,45 @@ %prep %setup -q -n kde-workspace-%{version} -###KDE47: rewrite! -#%%patch8 +## KDM patches +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 +%patch8 +%patch9 -p0 +%patch10 +%patch11 +%patch12 -p1 +%patch13 +%patch14 -p1 +%patch15 +## Workspace patches +%patch16 +%patch17 %patch18 -#%%patch60 -%patch62 -%patch63 -%patch64 -%if %suse_version > 1210 -%patch65 -%endif -%patch66 -%patch67 -%patch68 -%patch69 -%patch70 -p0 -%patch71 -%patch77 -%patch82 -%patch88 -### Remove when KDM KCM configuration bugs are fixed -###KDE47: rediff! -#%%patch94 -%patch98 -%patch99 -%patch104 -%patch106 -%patch107 -%patch108 -%patch123 -%patch124 -p1 -###KDE47: rediff -#%%patch125 -%patch126 -p1 -%patch127 -p1 -%patch201 -p1 -%patch202 -p1 -%patch213 -p1 +%patch19 +%patch20 +%patch21 +%patch22 +%patch23 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 %if %{with_systemd} -%patch214 -p1 +%patch27 -p1 %endif -%patch400 -p0 -%patch401 -p1 -%patch402 -p1 -%patch403 -p1 -%patch404 -p1 -%patch405 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build -### TODO: -DKDE4_ENABLE_FINAL=1 EXTRA_FLAGS="-DKDE4_COMMON_PAM_SERVICE=xdm \ -DSYSCONF_INSTALL_DIR=/etc \ -DKDE4_ENABLE_FPIE=1" @@ -457,18 +418,12 @@ rm -rf %{buildroot} rm -rf filelists -%if 0%{?suse_version} >= 1140 %verifyscript %verify_permissions -e %{_kde4_libexecdir}/kcheckpass -%verify_permissions -e %{_kde4_libexecdir}/kdesud -%endif %post /sbin/ldconfig -%if 0%{?suse_version} >= 1140 %set_permissions %{_kde4_libexecdir}/kcheckpass -%set_permissions %{_kde4_libexecdir}/kdesud -%endif %postun -p /sbin/ldconfig @@ -539,11 +494,9 @@ %doc COPYING %{_kde4_appsdir}/kwin/cubecap.png %{_kde4_appsdir}/kwin/titlebar_decor.png -%if 0%{?suse_version} > 1140 %{_kde4_appsdir}/plasma-desktop/init %{_kde4_appsdir}/plasma-netbook/init %{_kde4_appsdir}/plasma/layout-templates -%endif %files -n kde4-kgreeter-plugins %defattr(-,root,root) @@ -598,7 +551,7 @@ %files liboxygenstyle %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kde4_libdir}/liboxygenstyle.* +%{_kde4_libdir}/liboxygenstyle.so.* %dir %{_kde4_modulesdir}/plugins/styles %{_kde4_modulesdir}/plugins/styles/oxygen.so @@ -620,6 +573,11 @@ %{_kde4_libdir}/libkscreensaver.so %{_kde4_libdir}/libprocesscore.so %{_kde4_libdir}/libprocessui.so +%{_kde4_libdir}/libpowerdevilconfigcommonprivate.so +%{_kde4_libdir}/libpowerdevilcore.so +%{_kde4_libdir}/libpowerdevilui.so +%{_kde4_libdir}/liboxygenstyle.so +%{_kde4_libdir}/liboxygenstyleconfig.so %{_kde4_libdir}/libksgrd.so %{_kde4_libdir}/libtaskmanager.so %{_kde4_libdir}/libksignalplotter.so @@ -656,9 +614,7 @@ %config %{_kde4_configkcfgdir}/ %{_kde4_datadir}/autostart/ %{_kde4_datadir}/dbus-1/ -%if %suse_version > 1110 %{_kde4_datadir}/polkit-1/ -%endif %{_kde4_iconsdir}/Oxygen* %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/* @@ -709,7 +665,11 @@ %exclude %{_kde4_libdir}/libksgrd.so %exclude %{_kde4_libdir}/libkworkspace.so %exclude %{_kde4_libdir}/liblsofui.so +%exclude %{_kde4_libdir}/libpowerdevilconfigcommonprivate.so +%exclude %{_kde4_libdir}/libpowerdevilcore.so +%exclude %{_kde4_libdir}/libpowerdevilui.so %exclude %{_kde4_libdir}/liboxygenstyle.* +%exclude %{_kde4_libdir}/liboxygenstyleconfig.so %exclude %{_kde4_libdir}/libplasmaclock.so %exclude %{_kde4_libdir}/libplasmagenericshell.so %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so @@ -735,10 +695,8 @@ %exclude %{_kde4_servicesdir}/plasma-scriptengine-dataengine-python.desktop %exclude %{_kde4_servicesdir}/plasma-scriptengine-runner-python.desktop %exclude %{_kde4_servicesdir}/plasma-scriptengine-wallpaper-python.desktop -%if 0%{?suse_version} > 1140 %exclude %{_kde4_appsdir}/plasma-desktop/init %exclude %{_kde4_appsdir}/plasma-netbook/init %exclude %{_kde4_appsdir}/plasma/layout-templates -%endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org