Hello community, here is the log from the commit of package ksysguard5 for openSUSE:Factory checked in at 2014-10-01 11:22:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksysguard5 (Old) and /work/SRC/openSUSE:Factory/.ksysguard5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksysguard5" Changes: -------- --- /work/SRC/openSUSE:Factory/ksysguard5/ksysguard5.changes 2014-08-16 15:43:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksysguard5.new/ksysguard5.changes 2014-10-01 11:22:52.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Sep 26 14:05:20 UTC 2014 - [email protected] + +- Update to 5.0.95: + * Use non-deprecated location for kxmlgui configuration +- Install translations +- Add rpmlintrc file for file-not-in-%lang warnings: we don't use + find_lang macro as it doesn't searches in subdirectories + +------------------------------------------------------------------- +Thu Sep 25 09:15:37 UTC 2014 - [email protected] + +- Drop %insserv_prereq preqeuires, not relevant for systemd service + +------------------------------------------------------------------- +Wed Sep 3 21:20:56 UTC 2014 - [email protected] + +- Add ksysguardd systemd service +- Add 0001-Use-run-for-ksysguardd-s-pid-file.patch, so daemon uses + /run instead of /var/run + +------------------------------------------------------------------- Old: ---- ksysguard-5.0.1.tar.xz New: ---- 0001-Use-run-for-ksysguardd-s-pid-file.patch ksysguard-5.0.95.tar.xz ksysguard5-rpmlintrc ksysguardd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksysguard5.spec ++++++ --- /var/tmp/diff_new_pack.HJM1VB/_old 2014-10-01 11:22:53.000000000 +0200 +++ /var/tmp/diff_new_pack.HJM1VB/_new 2014-10-01 11:22:53.000000000 +0200 @@ -17,13 +17,17 @@ Name: ksysguard5 -Version: 5.0.1 +Version: 5.0.95 Release: 0 Summary: KDE System Guard daemon License: GPL-2.0 Group: System/GUI/KDE Url: http://www.kde.org -Source0: ksysguard-%{version}.tar.xz +Source: ksysguard-%{version}.tar.xz +Source1: ksysguardd.service +Source99: %{name}-rpmlintrc +# PATCH-FIX-OPENSUSE 0001-Use-run-for-ksysguardd-s-pid-file.patch +Patch0: 0001-Use-run-for-ksysguardd-s-pid-file.patch BuildRequires: extra-cmake-modules BuildRequires: gcc-c++ BuildRequires: kconfig-devel @@ -38,6 +42,7 @@ BuildRequires: libksysguard5-devel BuildRequires: libsensors4-devel BuildRequires: plasma-framework-devel +BuildRequires: systemd-rpm-macros BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 BuildRequires: pkgconfig(Qt5Network) >= 5.3.0 @@ -51,6 +56,7 @@ Conflicts: kdebase4-workspace-ksysguardd BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %description This package contains the ksysguard daemon and application. @@ -58,20 +64,35 @@ This package can be installed on servers without any other KDE packages to enable monitoring them remotely with ksysguard. +%lang_package %prep %setup -q -n ksysguard-%{version} +%patch0 -p1 %build - %cmake_kf5 -d build -- -DBUILD_po=OFF + %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 %make_jobs %install %kf5_makeinstall -C build %suse_update_desktop_file ksysguard System Monitor -%post -p /sbin/ldconfig + install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/ksysguardd.service -%postun -p /sbin/ldconfig +%pre +%service_add_pre ksysguardd.service + +%preun +%service_del_preun ksysguardd.service + +%post +/sbin/ldconfig +%service_add_post ksysguardd.service + +%postun +/sbin/ldconfig +%service_del_postun ksysguardd.service +exit 0 %files %defattr(-,root,root) @@ -88,5 +109,11 @@ %{_kf5_htmldir}/en/ksysguard/ %{_kf5_iconsdir}/hicolor/*/*/ %{_kf5_sharedir}/ksysguard/ +%{_kf5_sharedir}/kxmlgui5/ +%{_unitdir}/ksysguardd.service + +%files lang +%defattr(-,root,root) +%{_kf5_localedir}/ %changelog ++++++ 0001-Use-run-for-ksysguardd-s-pid-file.patch ++++++ From 69a8d66c4682410537ce8d1f2b7012fb49773005 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> Date: Wed, 3 Sep 2014 23:13:35 +0200 Subject: [PATCH 1/1] Use /run for ksysguardd's pid file --- ksysguardd/ksysguardd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ksysguardd/ksysguardd.c b/ksysguardd/ksysguardd.c index a5ecca1..883f8a1 100644 --- a/ksysguardd/ksysguardd.c +++ b/ksysguardd/ksysguardd.c @@ -62,7 +62,7 @@ static ClientInfo ClientList[ MAX_CLIENTS ]; static int SocketPort = -1; static unsigned char BindToAllInterfaces = 0; static int CurrentSocket; -static const char LockFile[] = "/var/run/ksysguardd.pid"; +static const char LockFile[] = "/run/ksysguardd.pid"; static const char *ConfigFile = KSYSGUARDDRCFILE; void signalHandler( int sig ); -- 2.1.0 ++++++ ksysguard-5.0.1.tar.xz -> ksysguard-5.0.95.tar.xz ++++++ ++++ 2920 lines of diff (skipped) ++++++ ksysguard5-rpmlintrc ++++++ # we don't use find_lang macro as it doesn't searches in subdirectories addFilter("file-not-in-%lang .*")++++++ ksysguardd.service ++++++ [Unit] Description=KDE ksysguard daemon [Service] Type=forking PIDFile=/run/ksysguardd.pid ExecStart=/usr/bin/ksysguardd -d PrivateTmp=true [Install] WantedBy=multi-user.target-- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
