packages: kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch, kd...

arekm arekm at pld-linux.org
Tue Jul 26 21:51:07 CEST 2011 

Author: arekm                        Date: Tue Jul 26 19:51:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.7.0; network manager unsolved

---- Files affected:
packages/kde4-kdebase-workspace:
   kde4-kdebase-workspace-kdmconfig.patch (1.16 -> 1.17) , kde4-kdebase-workspace.spec (1.272 -> 1.273) , kdebase-workspace-4.6.2-kwin-opengltest-kde-bug-23270942.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch:1.16 packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch:1.17
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch:1.16	Fri Jan 21 15:47:15 2011
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch	Tue Jul 26 21:51:02 2011
@@ -28,8 +28,8 @@
  #endif
  
      m_userPixDir = config->group("X-*-Greeter").readEntry("FaceDir",
--            KStandardDirs::installPath("data") + "kdm/faces") + '/';
-+            "/etc/X11/kdm/faces" ) + '/';
+-            QString(KStandardDirs::installPath("data") + "kdm/faces" + '/'));
++            QString("/etc/X11/kdm/faces/"));
  
      if (!getpwnam("nobody"))
          KMessageBox::sorry(this, i18n(

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.272 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.273
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.272	Fri Jul  1 14:28:49 2011
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec	Tue Jul 26 21:51:02 2011
@@ -1,19 +1,19 @@
 # $Revision$, $Date$
 # TODO:
 # - subpackage PolicyKit-kde and O: PolicyKit-kde
-%define		orgname		kdebase-workspace
+%define		orgname		kde-workspace
 %define		_state		stable
 %define		qtver		4.7.3
 
 Summary:	KDE 4 base workspace components
 Summary(pl.UTF-8):	Podstawowe komponenty środowiska KDE 4
 Name:		kde4-kdebase-workspace
-Version:	4.6.5
-Release:	1
+Version:	4.7.0
+Release:	0.1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	105faa1f1a0c4d79afec08a2dc7b5e0d
+# Source0-md5:	92d2623901816f9b12681a34bd2cea22
 Source1:	kdebase-kdesktop.pam
 Source2:	kdebase-kdm.pam
 Source3:	kdebase-kdm-np.pam
@@ -31,7 +31,6 @@
 Patch0:		%{name}-rootprivs.patch
 Patch1:		%{name}-kdmconfig.patch
 Patch2:		%{name}-nm-09-compat.patch
-Patch3:		kdebase-workspace-4.6.2-kwin-opengltest-kde-bug-23270942.patch
 URL:		http://www.kde.org/
 BuildRequires:	ConsoleKit-devel
 BuildRequires:	NetworkManager-devel >= 0.8.999
@@ -280,17 +279,6 @@
 Demon KDE, który monitoruje wiadomości jakie lokalni użytkownicy
 wysyłają za pomocą komend write lub wall.
 
-%package wallpapers
-Summary:	KDE 4 wallpapers
-Summary(pl.UTF-8):	Tapety KDE 4
-Group:		X11/Applications
-
-%description wallpapers
-KDE 4 wallpapers.
-
-%description wallpapers -l pl.UTF-8
-Tapety KDE 4.
-
 %package -n kde4-kdm
 Summary:	KDE Display Manager
 Summary(pl.UTF-8):	Zarządca ekranów KDE
@@ -524,8 +512,8 @@
 #%%patch100 -p1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+# what to do with this?
+# %patch2 -p1
 
 %build
 install -d build
@@ -567,7 +555,6 @@
 install %{SOURCE11}	$RPM_BUILD_ROOT/etc/X11/kdm/Xsession
 
 install %{SOURCE6}	$RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/pldlogo.png
-install %{SOURCE7}	$RPM_BUILD_ROOT%{_datadir}/wallpapers/kdm_pld.png
 
 install %{SOURCE16} $RPM_BUILD_ROOT%{_bindir}/kde4-session
 install %{SOURCE15} $RPM_BUILD_ROOT/etc/X11/sessions/kde4.desktop
@@ -660,6 +647,7 @@
 %attr(755,root,root) %{_bindir}/kdostartupconfig4
 %attr(755,root,root) %{_bindir}/oxygen-demo
 %attr(755,root,root) %{_bindir}/oxygen-settings
+%attr(755,root,root) %{_bindir}/oxygen-shadow-demo
 #%attr(755,root,root) %{_bindir}/setscheduler
 %attr(755,root,root) %{_libdir}/libkdecorations.so.*
 %attr(755,root,root) %{_libdir}/libksignalplotter.so.*
@@ -691,7 +679,7 @@
 #%{_datadir}/kde4/services/settings-input-actions.desktop
 
 # remotewidgets
-#%attr(755,root,root) %{_libdir}/kde4/kcm_remotewidgets.so
+%attr(755,root,root) %{_bindir}/remote-widgets-browser
 #%{_datadir}/kde4/services/remotewidgets.desktop
 
 # autostart
@@ -726,6 +714,7 @@
 %attr(755,root,root) %{_libdir}/kde4/kded_khotkeys.so
 #%attr(755,root,root) %{_libdir}/kconf_update_bin/khotkeys_update
 %attr(755,root,root) %{_libdir}/kconf_update_bin/krdb_clearlibrarypath
+%{_datadir}/apps/kcmkeyboard
 %{_datadir}/apps/kcmkeys
 #%{_datadir}/apps/kconf_update/khotkeys_32b1_update.upd
 %{_datadir}/apps/khotkeys
@@ -750,6 +739,7 @@
 %attr(755,root,root) %{_libdir}/libkdeinit4_krunner.so
 #%attr(755,root,root) %{_libdir}/kde4/kcm_krunner_shell.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_krunner_kill.so
+%attr(755,root,root) %{_libdir}/kde4/krunner_activities.so
 %attr(755,root,root) %{_libdir}/kde4/krunner_bookmarksrunner.so
 %attr(755,root,root) %{_libdir}/kde4/krunner_calculatorrunner.so
 %attr(755,root,root) %{_libdir}/kde4/krunner_kill.so
@@ -937,10 +927,12 @@
 
 # ion
 %attr(755,root,root) %{_libdir}/kde4/ion_bbcukmet.so
+%attr(755,root,root) %{_libdir}/kde4/ion_debianweather.so
 %attr(755,root,root) %{_libdir}/kde4/ion_envcan.so
 %attr(755,root,root) %{_libdir}/kde4/ion_noaa.so
 %attr(755,root,root) %{_libdir}/kde4/ion_wettercom.so
 %{_datadir}/kde4/services/ion-bbcukmet.desktop
+%{_datadir}/kde4/services/ion-debianweather.desktop
 %{_datadir}/kde4/services/ion-envcan.desktop
 %{_datadir}/kde4/services/ion-noaa.desktop
 %{_datadir}/kde4/services/ion-wettercom.desktop
@@ -1042,6 +1034,7 @@
 %{_datadir}/config/background.knsrc
 %{_datadir}/config/colorschemes.knsrc
 %{_datadir}/config/wallpaper.knsrc
+%{_datadir}/config/xcursor.knsrc
 %{_iconsdir}/*/*/apps/kcmkwm.png
 %{_iconsdir}/*/*/apps/computer.png
 %{_iconsdir}/*/*/apps/daemon.png
@@ -1074,6 +1067,9 @@
 %{_datadir}/config.kcfg/freespacenotifier.kcfg
 %{_datadir}/apps/freespacenotifier
 
+%{_datadir}/wallpapers/stripes.png
+%{_datadir}/wallpapers/stripes.png.desktop
+
 #%files -n PolicyKit-kde
 #%defattr(644,root,root,755)
 #%attr(755,root,root) %{_bindir}/polkit-kde-authorization
@@ -1116,7 +1112,7 @@
 %attr(755,root,root) %{_libdir}/liblsofui.so
 #%attr(755,root,root) %{_libdir}/libpolkitkdeprivate.so
 %attr(755,root,root) %{_libdir}/liboxygenstyle.so
-%{_libdir}/cmake/KDE4Workspace-%{version}*
+%{_libdir}/cmake/KDE4Workspace
 %{_includedir}/KDE/Plasma/Weather
 %{_includedir}/plasma/geolocation
 %{_includedir}/plasma/weather
@@ -1255,31 +1251,32 @@
 %attr(755,root,root) %{_libdir}/kde4/libexec/kwin_opengl_test
 %attr(755,root,root) %{_libdir}/kde4/libexec/kwin_rules_dialog
 %dir %{_datadir}/apps/kwin
+%{_datadir}/apps/kwin/*.glsl
 %{_datadir}/apps/kwin/DefaultTabBoxLayouts.xml
 %{_datadir}/apps/kwin/circle-edgy.png
 %{_datadir}/apps/kwin/circle.png
-%{_datadir}/apps/kwin/snowflake.png
+#%{_datadir}/apps/kwin/snowflake.png
 %dir %{_datadir}/apps/kwin/default_rules
 %{_datadir}/apps/kwin/default_rules/fsp_workarounds_1.kwinrules
 %{_datadir}/apps/kwin/explosion-end.png
 %{_datadir}/apps/kwin/explosion-start.png
 %{_datadir}/apps/kwin/explosion.frag
-%{_datadir}/apps/kwin/explosion.vert
+#%{_datadir}/apps/kwin/explosion.vert
 %{_datadir}/apps/kwin/invert.frag
-%{_datadir}/apps/kwin/invert.vert
+#%{_datadir}/apps/kwin/invert.vert
 %{_datadir}/apps/kwin/kwin.notifyrc
 %{_datadir}/apps/kwin/lookingglass.frag
-%{_datadir}/apps/kwin/lookingglass.vert
-%{_datadir}/apps/kwin/shadow-texture.png
-%{_datadir}/apps/kwin/sharpen.frag
-%{_datadir}/apps/kwin/sharpen.vert
+#%{_datadir}/apps/kwin/lookingglass.vert
+#%{_datadir}/apps/kwin/shadow-texture.png
+#%{_datadir}/apps/kwin/sharpen.frag
+#%{_datadir}/apps/kwin/sharpen.vert
 %{_datadir}/apps/kwin/trackmouse.png
 %{_datadir}/apps/kwin/cubecap.png
 %{_datadir}/apps/kwin/cylinder.frag
 %{_datadir}/apps/kwin/cylinder.vert
 %{_datadir}/apps/kwin/sphere.vert
-%{_datadir}/apps/kwin/snow.frag
-%{_datadir}/apps/kwin/snow.vert
+#%{_datadir}/apps/kwin/snow.frag
+#%{_datadir}/apps/kwin/snow.vert
 %{_datadir}/apps/kwin/tabstrip.desktop
 %{_datadir}/config.kcfg/kwin.kcfg
 %{_datadir}/dbus-1/interfaces/org.kde.KWin.xml
@@ -1315,16 +1312,17 @@
 %{_datadir}/kde4/services/kwin/minimizeanimation.desktop
 %{_datadir}/kde4/services/kwin/mousemark.desktop
 %{_datadir}/kde4/services/kwin/mousemark_config.desktop
+%{_datadir}/kde4/services/kwin/outline.desktop
 %{_datadir}/kde4/services/kwin/presentwindows.desktop
 %{_datadir}/kde4/services/kwin/presentwindows_config.desktop
 %{_datadir}/kde4/services/kwin/resize.desktop
 %{_datadir}/kde4/services/kwin/resize_config.desktop
 %{_datadir}/kde4/services/kwin/scalein.desktop
 %{_datadir}/kde4/services/kwin/screenshot.desktop
-%{_datadir}/kde4/services/kwin/shadow.desktop
-%{_datadir}/kde4/services/kwin/shadow_config.desktop
-%{_datadir}/kde4/services/kwin/sharpen.desktop
-%{_datadir}/kde4/services/kwin/sharpen_config.desktop
+#%{_datadir}/kde4/services/kwin/shadow.desktop
+#%{_datadir}/kde4/services/kwin/shadow_config.desktop
+#%{_datadir}/kde4/services/kwin/sharpen.desktop
+#%{_datadir}/kde4/services/kwin/sharpen_config.desktop
 %{_datadir}/kde4/services/kwin/showfps.desktop
 %{_datadir}/kde4/services/kwin/showpaint.desktop
 %{_datadir}/kde4/services/kwin/slide.desktop
@@ -1347,8 +1345,8 @@
 %{_datadir}/kde4/services/kwinrules.desktop
 %{_datadir}/kde4/services/kwin/flipswitch.desktop
 %{_datadir}/kde4/services/kwin/flipswitch_config.desktop
-%{_datadir}/kde4/services/kwin/snow.desktop
-%{_datadir}/kde4/services/kwin/snow_config.desktop
+#%{_datadir}/kde4/services/kwin/snow.desktop
+#%{_datadir}/kde4/services/kwin/snow_config.desktop
 %{_datadir}/kde4/services/kwin/showfps_config.desktop
 %{_datadir}/kde4/services/kwin/wobblywindows.desktop
 %{_datadir}/kde4/services/kwin/wobblywindows_config.desktop
@@ -1380,6 +1378,7 @@
 %{_datadir}/apps/kconf_update/kwin_focus2.upd
 %{_datadir}/apps/kconf_update/kwin_fsp_workarounds_1.upd
 %{_datadir}/apps/kconf_update/kwin_on_off.upd
+%{_datadir}/apps/kconf_update/kwin_remove_effects.upd
 %{_datadir}/apps/kconf_update/kwin_window_shortcuts.sh
 %{_datadir}/apps/kconf_update/kwin_window_shortcuts.upd
 %{_datadir}/apps/kconf_update/kwiniconify.upd
@@ -1429,6 +1428,7 @@
 %attr(755,root,root) %{_libdir}/kde4/plasma_applet_pager.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_applet_quicklaunch.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_applet_searchbox.so
+%attr(755,root,root) %{_libdir}/kde4/plasma_applet_showActivityManager.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_applet_simplelauncher.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_applet_systemtray.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_applet_tasks.so
@@ -1523,6 +1523,12 @@
 %dir %{_datadir}/apps/plasma_scriptengine_ruby
 %{_datadir}/apps/plasma_scriptengine_ruby/applet.rb
 %{_datadir}/apps/plasma_scriptengine_ruby/data_engine.rb
+%{_datadir}/kde4/services/plasma-applet-org.kde.showActivityManager.desktop
+%{_datadir}/kde4/services/plasma-dataengine-share-addon-imgsusepasteorg.desktop
+%{_datadir}/kde4/services/plasma-dataengine-share-addon-kde.desktop
+%{_datadir}/kde4/services/plasma-layout-org.kde.plasma-desktop.SaL.desktop
+%{_datadir}/kde4/services/plasma-layout-org.kde.plasma-desktop.desktopIcons.desktop
+%{_datadir}/kde4/services/plasma-runner-activityrunner.desktop
 %{_datadir}/kde4/services/plasma-scriptengine-ruby-applet.desktop
 %{_datadir}/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
 %dir %{_datadir}/apps/plasma/services
@@ -1538,7 +1544,9 @@
 %{_datadir}/apps/plasma/services/searchlaunch.operations
 %{_datadir}/apps/plasma/services/statusnotifieritem.operations
 %dir %{_datadir}/apps/plasma/shareprovider
+%{_datadir}/apps/plasma/shareprovider/imgsusepasteorg
 %{_datadir}/apps/plasma/shareprovider/imgur
+%{_datadir}/apps/plasma/shareprovider/kde
 %{_datadir}/apps/plasma/shareprovider/pastebincom
 %{_datadir}/apps/plasma/shareprovider/pasteopensuseorg
 %{_datadir}/apps/plasma/shareprovider/pasteubuntucom
@@ -1711,7 +1719,7 @@
 #%attr(755,root,root) %{_libdir}/kde4/solid_hal_power.so
 #%attr(755,root,root) %{_libdir}/kde4/solid_bluez.so
 %attr(755,root,root) %{_libdir}/kde4/solid_wicd.so
-%attr(755,root,root) %{_libdir}/kde4/solid_lirc.so
+#%attr(755,root,root) %{_libdir}/kde4/solid_lirc.so
 %dir %{_datadir}/apps/solid
 %dir %{_datadir}/apps/solid/actions
 %dir %{_datadir}/apps/solid/devices
@@ -1728,14 +1736,14 @@
 %{_datadir}/kde4/servicetypes/solidnetworkmanager.desktop
 #%{_datadir}/kde4/servicetypes/solidpowermanager.desktop
 %{_datadir}/kde4/servicetypes/solid-device-type.desktop
-%{_datadir}/kde4/servicetypes/solidremotecontrolmanager.desktop
+#%{_datadir}/kde4/servicetypes/solidremotecontrolmanager.desktop
 %dir %{_datadir}/apps/kcmsolidactions
 %{_datadir}/apps/kcmsolidactions/solid-action-template.desktop
 
 %files networkmanager
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde4/solid_networkmanager07.so
-%{_iconsdir}/*/*x*/apps/networkmanager.png
+#%attr(755,root,root) %{_libdir}/kde4/solid_networkmanager07.so
+#%{_iconsdir}/*/*x*/apps/networkmanager.png
 
 %files kwrited
 %defattr(644,root,root,755)
@@ -1744,26 +1752,6 @@
 %dir %{_datadir}/apps/kwrited
 %{_datadir}/apps/kwrited/kwrited.notifyrc
 
-%files wallpapers
-%defattr(644,root,root,755)
-%{_datadir}/wallpapers/Air
-%{_datadir}/wallpapers/Aghi
-%{_datadir}/wallpapers/Evening
-%{_datadir}/wallpapers/Fields_of_Peace
-%{_datadir}/wallpapers/Finally_Summer_in_Germany
-%{_datadir}/wallpapers/Fresh_Morning
-%{_datadir}/wallpapers/Horos
-%{_datadir}/wallpapers/Media_Life
-%{_datadir}/wallpapers/Plasmalicious
-%{_datadir}/wallpapers/Quadros
-%{_datadir}/wallpapers/Red_Leaf
-%{_datadir}/wallpapers/Autumn
-%{_datadir}/wallpapers/Blue_Wood
-%{_datadir}/wallpapers/Grass
-%{_datadir}/wallpapers/Hanami
-%{_datadir}/wallpapers/stripes.png
-%{_datadir}/wallpapers/stripes.png.desktop
-
 %files -n kde4-kdm
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/kdm
@@ -1796,7 +1784,6 @@
 %{_datadir}/apps/kdm/*
 %{_datadir}/config/kdm.knsrc
 %{_datadir}/kde4/services/kdm.desktop
-%{_datadir}/wallpapers/kdm_pld.png
 %{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmkdm.service
 %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
 %lang(en) %{_kdedocdir}/en/kdm
@@ -1883,6 +1870,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.273  2011/07/26 19:51:02  arekm
+- up to 4.7.0; network manager unsolved
+
 Revision 1.272  2011/07/01 12:28:49  arekm
 - up to 4.6.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.272&r2=1.273&f=u

More information about the pld-cvs-commit mailing list