Raymond Wooninck 2015-12-15 19:08:29 +00:00 committed by Git OBS Bridge
parent 29394dc0e8
commit e3f58bfcb6
3 changed files with 2 additions and 59 deletions

View File

@ -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 * https://www.kde.org/announcements/announce-applications-15.12.0.php
* boo#958887 * 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 Tue Nov 10 20:17:35 UTC 2015 - tittiatcoke@gmail.com

View File

@ -26,7 +26,6 @@ Summary: System Log Viewer Tool
License: GPL-2.0 License: GPL-2.0
Group: System/Monitoring Group: System/Monitoring
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Patch1: ksystemlog_suse_log_locations.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires %kde4_runtime_requires
@ -40,7 +39,6 @@ want to quickly see problems occurring on their server.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1
%build %build
%cmake_kde4 -d build %cmake_kde4 -d build

View File

@ -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<int>() << INFORMATION_LOG_LEVEL_ID
) {