commit plasma5-workspace for openSUSE:Factory

12 Sep 2014

Hello community,

here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2014-09-12 17:04:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old)
 and      /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "plasma5-workspace"

Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes	2014-09-01 16:59:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes	2014-09-12 17:05:48.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Sep 11 16:28:16 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.0.95~git20140911 (r93ed2cb):
+   * Allow to swap plasmoids via alternatives system
+   * Introduction of 'Look and Feel' packages: allows users to change
+     outlook of entire desktop in a single place
+   * Various other bugfixes, improvements and cleanups
+- Split shared libraries into libs subpackage
+- Added 0003-Remove-export-of-QT_PLUGIN_PATH.patch: we install
+  plugins to directory known to Qt5, so export just pollutes
+  both Qt4 and Qt5 plugins
+- Recommend sni-qt
+- Add baselibs.conf
+- Don't install libKF5XmlRpcClientPrivate, as it's a private lib
+
+-------------------------------------------------------------------

Old:
----
  plasma-workspace-5.0.1.tar.xz

New:
----
  0003-Remove-export-of-QT_PLUGIN_PATH.patch
  baselibs.conf
  plasma-workspace-5.0.95~git20140911.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ plasma5-workspace.spec ++++++
--- /var/tmp/diff_new_pack.oQeWHC/_old	2014-09-12 17:05:50.000000000 +0200
+++ /var/tmp/diff_new_pack.oQeWHC/_new	2014-09-12 17:05:50.000000000 +0200
@@ -17,17 +17,20 @@
 
 
 Name:           plasma5-workspace
-Version:        5.0.1
+Version:        5.0.95~git20140911
 Release:        0
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0+
 Group:          System/GUI/KDE
 Url:            http://www.kde.org/
-Source0:        plasma-workspace-%{version}.tar.xz
+Source:         plasma-workspace-%{version}.tar.xz
+Source1:        baselibs.conf
 # PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde
 Patch0:         0001-Rename-qdbus-in-startkde.patch
 # PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8
 Patch1:         create_kdehome.patch
+# PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins
+Patch2:         0003-Remove-export-of-QT_PLUGIN_PATH.patch
 BuildRequires:  alsa-devel
 BuildRequires:  baloo5-devel >= 5.0.0
 BuildRequires:  kactivities5-devel >= 5.0.0
@@ -108,6 +111,8 @@
 Recommends:     phonon4qt5-backend
 # people should be able to adjust desktop
 Recommends:     systemsettings5
+# so Qt4-only apps have some colors in tray
+Recommends:     sni-qt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -129,10 +134,18 @@
 of the focused window. Unlike regular shortcuts, the application's window
 does not need focus for them to be activated.
 
+%package libs
+Summary:        The KDE Plasma Workspace Components
+Group:          Development/Libraries/KDE
+
+%description libs
+This package contains the basic packages for a K Desktop Environment
+workspace.
+
 %package devel
 Summary:        The KDE Plasma Workspace Components
 Group:          Development/Libraries/KDE
-Requires:       %{name} = %{version}
+Requires:       %{name}-libs = %{version}
 Conflicts:      kdebase4-workspace-devel
 Provides:       plasma-workspace5-devel = %{version}
 Obsoletes:      plasma-workspace5-devel <= %{version}
@@ -145,6 +158,7 @@
 %setup -q -n plasma-workspace-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
   %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DBUILD_po=OFF -DKDE_DEFAULT_HOME=.kde4
@@ -155,12 +169,18 @@
   install -p -D -m755 drkonqi/doc/examples/installdbgsymbols_suse.sh \
   %{buildroot}/usr/bin/installdbgsymbols.sh
   # we have a separate package for Plasma5 session
-  rm -rf %{buildroot}%{_kf5_sharedir}/xsessions
+  rm -rfv %{buildroot}%{_kf5_sharedir}/xsessions
+  # as the name says, this is private library
+  rm -rfv %{buildroot}%{_kf5_libdir}/libKF5XmlRpcClientPrivate.so
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %post -n drkonqi5 -p /sbin/ldconfig
 
 %postun -n drkonqi5 -p /sbin/ldconfig
@@ -169,6 +189,14 @@
 
 %postun -n kglobalaccel5 -p /sbin/ldconfig
 
+%files libs
+%defattr(-,root,root)
+%doc COPYING*
+%{_kf5_libdir}/libkworkspace5.so.*
+%{_kf5_libdir}/libplasma-geolocation-interface.so.*
+%{_kf5_libdir}/libtaskmanager.so.*
+%{_kf5_libdir}/libweather_ion.so.*
+
 %files
 %defattr(-,root,root)
 %doc COPYING*
@@ -183,6 +211,7 @@
 %{_kf5_bindir}/kstartupconfig5
 %{_kf5_bindir}/kuiserver5
 %{_kf5_bindir}/plasmashell
+%{_kf5_bindir}/plasmawindowed
 %{_kf5_bindir}/startkde
 %{_kf5_bindir}/systemmonitor
 %{_kf5_configdir}/autostart/org.kde.klipper.desktop
@@ -199,13 +228,10 @@
 %{_kf5_libdir}/libkdeinit5_klipper.so
 %{_kf5_libdir}/libkdeinit5_ksmserver.so
 %{_kf5_libdir}/libkdeinit5_kuiserver5.so
-%{_kf5_libdir}/libkworkspace.so.*
-%{_kf5_libdir}/libplasma-geolocation-interface.so.*
-%{_kf5_libdir}/libtaskmanager.so.*
-%{_kf5_libdir}/libweather_ion.so.*
 %{_kf5_plugindir}/
 %{_kf5_qmldir}/
 %{_kf5_applicationsdir}/org.kde.klipper.desktop
+%{_kf5_applicationsdir}/plasma-windowed.desktop
 %{_kf5_configkcfgdir}/freespacenotifier.kcfg
 %{_kf5_sharedir}/dbus-1/services/kf5_org.kde.kuiserver.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service
@@ -244,20 +270,19 @@
 %files devel
 %defattr(-,root,root)
 %doc COPYING*
-%{_includedir}/KDE/
-%{_includedir}/kworkspace/
-%{_includedir}/plasma/
-%{_includedir}/taskmanager/
+%{_kf5_prefix}/include/KDE/
+%{_kf5_prefix}/include/kworkspace5/
+%{_kf5_prefix}/include/plasma/
+%{_kf5_prefix}/include/taskmanager/
 %{_kf5_libdir}/cmake/KRunnerAppDBusInterface/
 %{_kf5_libdir}/cmake/KSMServerDBusInterface/
 %{_kf5_libdir}/cmake/LibKWorkspace/
 %{_kf5_libdir}/cmake/LibTaskManager/
 %{_kf5_libdir}/cmake/ScreenSaverDBusInterface/
-%{_kf5_libdir}/libkworkspace.so
+%{_kf5_libdir}/libkworkspace5.so
 %{_kf5_libdir}/libplasma-geolocation-interface.so
 %{_kf5_libdir}/libtaskmanager.so
 %{_kf5_libdir}/libweather_ion.so
-%{_kf5_libdir}/libKF5XmlRpcClientPrivate.so
 %{_kf5_sharedir}/dbus-1/interfaces/
 
 %changelog

++++++ 0001-Rename-qdbus-in-startkde.patch ++++++
--- /var/tmp/diff_new_pack.oQeWHC/_old	2014-09-12 17:05:50.000000000 +0200
+++ /var/tmp/diff_new_pack.oQeWHC/_new	2014-09-12 17:05:50.000000000 +0200
@@ -1,5 +1,5 @@
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 40e3377..37c2840 100644
+index 91c8a3c..0c658bd 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -20,13 +20,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE
@@ -18,7 +18,7 @@
  fi
  
  # Check if a KDE session already is running and whether it's possible to connect to X
-@@ -294,9 +294,9 @@ fi
+@@ -300,9 +300,9 @@ fi
  if $qdbus >/dev/null 2>/dev/null; then
      : # ok
  else

++++++ 0003-Remove-export-of-QT_PLUGIN_PATH.patch ++++++
...
From dde9b1c1930d333d8daff25c73400e1e67f3c630 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Sun, 7 Sep 2014 22:55:24 +0200
Subject: [PATCH 3/3] Remove export of QT_PLUGIN_PATH
---
 startkde/startkde.cmake | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 51721d1..1d67be0 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -220,12 +220,6 @@ for prefix in `echo $scriptpath`; do
   done
 done
 
-# Set the path for Qt plugins provided by KDE
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
-# TODO: Do we really need this?
-QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
-export QT_PLUGIN_PATH
-
 # Activate the kde font directories.
 #
 # There are 4 directories that may be used for supplying fonts for KDE.
-- 
2.1.0

++++++ baselibs.conf ++++++
plasma5-workspace-libs 
++++++ create_kdehome.patch ++++++
--- /var/tmp/diff_new_pack.oQeWHC/_old	2014-09-12 17:05:50.000000000 +0200
+++ /var/tmp/diff_new_pack.oQeWHC/_new	2014-09-12 17:05:50.000000000 +0200
@@ -1,5 +1,5 @@
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 48f7062..434455f 100644
+index 0c658bd..51721d1 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -64,6 +64,14 @@ fi

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)