From 29394dc0e8e332bc16138481195af335332434dc4c571aad2fdbfd8d76903f87 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Dec 2015 13:27:45 +0000 Subject: [PATCH 1/5] update to (15.12.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksystemlog?expand=0&rev=19 --- ksystemlog-15.08.3.tar.xz | 3 --- ksystemlog-15.12.0.tar.xz | 3 +++ ksystemlog.changes | 9 +++++++++ ksystemlog.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 ksystemlog-15.08.3.tar.xz create mode 100644 ksystemlog-15.12.0.tar.xz diff --git a/ksystemlog-15.08.3.tar.xz b/ksystemlog-15.08.3.tar.xz deleted file mode 100644 index 0d3c0d1..0000000 --- a/ksystemlog-15.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd34a99d8cdee9ddabc7372c4aa4b63ce788c4fe5bd48487a5d998a17c67ea89 -size 381832 diff --git a/ksystemlog-15.12.0.tar.xz b/ksystemlog-15.12.0.tar.xz new file mode 100644 index 0000000..372abe6 --- /dev/null +++ b/ksystemlog-15.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:629f20c8d4725866b5e4b51153a2e1f9f8b119b7b5d8369f8d401acb9cca0abf +size 395508 diff --git a/ksystemlog.changes b/ksystemlog.changes index b9a396d..756b2f7 100644 --- a/ksystemlog.changes +++ b/ksystemlog.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Dec 13 13:27:42 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + ------------------------------------------------------------------- Tue Nov 10 20:17:35 UTC 2015 - tittiatcoke@gmail.com diff --git a/ksystemlog.spec b/ksystemlog.spec index f1db0cf..40e4f19 100644 --- a/ksystemlog.spec +++ b/ksystemlog.spec @@ -20,7 +20,7 @@ Name: ksystemlog BuildRequires: libkde4-devel BuildRequires: oxygen-icon-theme-large Url: http://www.kde.org -Version: 15.08.3 +Version: 15.12.0 Release: 0 Summary: System Log Viewer Tool License: GPL-2.0 From e3f58bfcb67151e14bb8601cd4834868dae80d0a5d24f21dd9fdf30ff0f9f020 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 19:08:29 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksystemlog?expand=0&rev=20 --- ksystemlog.changes | 2 ++ ksystemlog.spec | 2 -- ksystemlog_suse_log_locations.diff | 57 ------------------------------ 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 ksystemlog_suse_log_locations.diff diff --git a/ksystemlog.changes b/ksystemlog.changes index 756b2f7..57085f2 100644 --- a/ksystemlog.changes +++ b/ksystemlog.changes @@ -6,6 +6,8 @@ Sun Dec 13 13:27:42 UTC 2015 - tittiatcoke@gmail.com * https://www.kde.org/announcements/announce-applications-15.12.0.php * boo#958887 +- Drop patch ksystemlog_suse_log_locations.diff as this is no longer + applicable. ------------------------------------------------------------------- Tue Nov 10 20:17:35 UTC 2015 - tittiatcoke@gmail.com diff --git a/ksystemlog.spec b/ksystemlog.spec index 40e4f19..4346603 100644 --- a/ksystemlog.spec +++ b/ksystemlog.spec @@ -26,7 +26,6 @@ Summary: System Log Viewer Tool License: GPL-2.0 Group: System/Monitoring Source0: %{name}-%{version}.tar.xz -Patch1: ksystemlog_suse_log_locations.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -40,7 +39,6 @@ want to quickly see problems occurring on their server. %prep %setup -q -n %{name}-%{version} -%patch1 -p1 %build %cmake_kde4 -d build diff --git a/ksystemlog_suse_log_locations.diff b/ksystemlog_suse_log_locations.diff deleted file mode 100644 index 5b218d1..0000000 --- a/ksystemlog_suse_log_locations.diff +++ /dev/null @@ -1,57 +0,0 @@ -Index: ksystemlog/src/logModePluginsLoader.cpp -=================================================================== ---- ksystemlog/src/logModePluginsLoader.cpp.orig 2008-02-13 16:45:54.000000000 +0100 -+++ ksystemlog/src/logModePluginsLoader.cpp 2010-11-21 17:32:48.952732317 +0100 -@@ -64,7 +64,7 @@ void LogModePluginsLoader::loadPlugins() - Globals::instance()->registerLogModeFactory(new KernelLogModeFactory()); - - //Authentication -- Globals::instance()->registerLogModeFactory(new AuthenticationLogModeFactory()); -+ //Globals::instance()->registerLogModeFactory(new AuthenticationLogModeFactory()); - - //Daemon - Globals::instance()->registerLogModeFactory(new DaemonLogModeFactory()); -Index: ksystemlog/src/modes/apache/apacheConfiguration.h -=================================================================== ---- ksystemlog/src/modes/apache/apacheConfiguration.h.orig 2010-09-27 21:52:09.000000000 +0200 -+++ ksystemlog/src/modes/apache/apacheConfiguration.h 2010-11-21 17:33:19.777717487 +0100 -@@ -51,11 +51,11 @@ class ApacheConfiguration : public LogMo - configuration->setCurrentGroup(QLatin1String( "ApacheLogMode" )); - - QStringList defaultApachePaths; -- defaultApachePaths << QLatin1String( "/var/log/apache2/error.log" ); -+ defaultApachePaths << QLatin1String( "/var/log/apache2/error_log" ); - configuration->addItemStringList(QLatin1String( "ApacheLogFilesPaths" ), d->apachePaths, defaultApachePaths, QLatin1String( "ApacheLogFilesPaths" )); - - QStringList defaultApacheAccessPaths; -- defaultApacheAccessPaths << QLatin1String( "/var/log/apache2/access.log" ); -+ defaultApacheAccessPaths << QLatin1String( "/var/log/apache2/access_log" ); - configuration->addItemStringList(QLatin1String( "ApacheAccessLogFilesPaths" ), d->apacheAccessPaths, defaultApacheAccessPaths, QLatin1String( "ApacheAccessLogFilesPaths" )); - } - -Index: ksystemlog/src/modes/cron/cronConfiguration.h -=================================================================== ---- ksystemlog/src/modes/cron/cronConfiguration.h.orig 2010-09-27 21:52:09.000000000 +0200 -+++ ksystemlog/src/modes/cron/cronConfiguration.h 2010-11-21 17:33:59.700717458 +0100 -@@ -51,7 +51,7 @@ class CronConfiguration : public LogMode - configuration->setCurrentGroup(QLatin1String( "CronLogMode" )); - - QStringList defaultCronPaths; -- defaultCronPaths << QLatin1String( "/var/log/syslog" ); -+ defaultCronPaths << QLatin1String( "/var/log/messages" ); - configuration->addItemStringList(QLatin1String( "LogFilesPaths" ), d->cronPaths, defaultCronPaths, QLatin1String( "LogFilesPaths" )); - - QString defaultProcessFilter(QLatin1String( "/usr/sbin/cron" )); -Index: ksystemlog/src/modes/system/systemConfiguration.h -=================================================================== ---- ksystemlog/src/modes/system/systemConfiguration.h.orig 2010-09-27 21:52:09.000000000 +0200 -+++ ksystemlog/src/modes/system/systemConfiguration.h 2010-11-21 17:34:33.298842516 +0100 -@@ -39,7 +39,7 @@ class SystemConfiguration : public Gener - SystemConfiguration() : - GenericLogModeConfiguration( - QLatin1String( SYSTEM_LOG_MODE_ID ), -- QStringList() << QLatin1String( "/var/log/syslog" ), -+ QStringList() << QLatin1String( "/var/log/messages" ), - QList() << INFORMATION_LOG_LEVEL_ID - ) { - From f96f4e17caed3b957c8d25c4364fdb757d5217361f796e10c6aa4f01e315ee26 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 19:15:27 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksystemlog?expand=0&rev=21 --- ksystemlog.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/ksystemlog.spec b/ksystemlog.spec index 4346603..dac80e2 100644 --- a/ksystemlog.spec +++ b/ksystemlog.spec @@ -17,8 +17,14 @@ Name: ksystemlog -BuildRequires: libkde4-devel +BuildRequires: extra-cmake-modules +BuildRequires: kdelibs4support-devel BuildRequires: oxygen-icon-theme-large +BuildRequires: update-desktop-files +BuildRequires: xz +BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Url: http://www.kde.org Version: 15.12.0 Release: 0 @@ -27,7 +33,6 @@ License: GPL-2.0 Group: System/Monitoring Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description This program is developed for use by beginner users, who do not know @@ -41,15 +46,12 @@ want to quickly see problems occurring on their server. %setup -q -n %{name}-%{version} %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %makeinstall - cd .. - %suse_update_desktop_file ksystemlog System Monitor - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file org.kde.ksystemlog System Monitor for i in {16,22,32,48,64,128}; do mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps cp /usr/share/icons/oxygen/"$i"x"$i"/apps/utilities-log-viewer.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps/; @@ -65,10 +67,12 @@ want to quickly see problems occurring on their server. %files %defattr(-,root,root) %doc COPYING -%{_kde4_bindir}/ksystemlog -%{_kde4_applicationsdir}/ksystemlog.desktop -%{_kde4_htmldir}/en/ksystemlog/ -%{_kde4_appsdir}/ksystemlog/ -%{_kde4_iconsdir}/hicolor/*/apps/utilities-log-viewer.* +%{_kf5_bindir}/ksystemlog +%{_kf5_applicationsdir}/*.desktop +%dir %{_kf5_htmldir}/en +%dir %{_kf5_htmldir} +%doc %{_kf5_htmldir}/en/*/ +%{_kf5_sharedir}/kxmlgui5/ +%{_kf5_iconsdir}/hicolor/*/*/*.png %changelog From cbc51eda707ba3f33014bd2a015396b32fb02c4ab7dd22227371a7f30c56bb04 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 19:16:02 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksystemlog?expand=0&rev=22 --- ksystemlog_suse_log_locations.diff | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 ksystemlog_suse_log_locations.diff diff --git a/ksystemlog_suse_log_locations.diff b/ksystemlog_suse_log_locations.diff new file mode 100644 index 0000000..b214a35 --- /dev/null +++ b/ksystemlog_suse_log_locations.diff @@ -0,0 +1,18 @@ +diff -urB ksystemlog/src/modes/apache/apacheConfiguration.h new/src/modes/apache/apacheConfiguration.h +--- ksystemlog/src/modes/apache/apacheConfiguration.h 2015-10-16 20:39:49.998438710 +0200 ++++ new/src/modes/apache/apacheConfiguration.h 2015-10-16 20:54:21.414726020 +0200 +@@ -52,12 +52,12 @@ + configuration->setCurrentGroup(QLatin1String("ApacheLogMode")); + + QStringList defaultApachePaths; +- defaultApachePaths << QLatin1String("/var/log/apache2/error.log"); ++ defaultApachePaths << QLatin1String("/var/log/apache2/error_log"); + configuration->addItemStringList(QLatin1String("ApacheLogFilesPaths"), d->apachePaths, + defaultApachePaths, QLatin1String("ApacheLogFilesPaths")); + + QStringList defaultApacheAccessPaths; +- defaultApacheAccessPaths << QLatin1String("/var/log/apache2/access.log"); ++ defaultApacheAccessPaths << QLatin1String("/var/log/apache2/access_log"); + configuration->addItemStringList(QLatin1String("ApacheAccessLogFilesPaths"), d->apacheAccessPaths, + defaultApacheAccessPaths, + QLatin1String("ApacheAccessLogFilesPaths")); From 32e8693c6dfcef999cea7eca4988f62255c8b55b3184a3f55afdb76761b1f077 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 19:17:16 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksystemlog?expand=0&rev=24 --- ksystemlog_suse_log_locations.diff | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 ksystemlog_suse_log_locations.diff diff --git a/ksystemlog_suse_log_locations.diff b/ksystemlog_suse_log_locations.diff deleted file mode 100644 index b214a35..0000000 --- a/ksystemlog_suse_log_locations.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff -urB ksystemlog/src/modes/apache/apacheConfiguration.h new/src/modes/apache/apacheConfiguration.h ---- ksystemlog/src/modes/apache/apacheConfiguration.h 2015-10-16 20:39:49.998438710 +0200 -+++ new/src/modes/apache/apacheConfiguration.h 2015-10-16 20:54:21.414726020 +0200 -@@ -52,12 +52,12 @@ - configuration->setCurrentGroup(QLatin1String("ApacheLogMode")); - - QStringList defaultApachePaths; -- defaultApachePaths << QLatin1String("/var/log/apache2/error.log"); -+ defaultApachePaths << QLatin1String("/var/log/apache2/error_log"); - configuration->addItemStringList(QLatin1String("ApacheLogFilesPaths"), d->apachePaths, - defaultApachePaths, QLatin1String("ApacheLogFilesPaths")); - - QStringList defaultApacheAccessPaths; -- defaultApacheAccessPaths << QLatin1String("/var/log/apache2/access.log"); -+ defaultApacheAccessPaths << QLatin1String("/var/log/apache2/access_log"); - configuration->addItemStringList(QLatin1String("ApacheAccessLogFilesPaths"), d->apacheAccessPaths, - defaultApacheAccessPaths, - QLatin1String("ApacheAccessLogFilesPaths"));