[kdeadmin] fix ksystemlog to find log files correctly
Than Ngo
than at fedoraproject.org
Fri Aug 3 22:31:55 UTC 2012
commit 8341b41f348e15209346a79713dab9c3806e7275
Author: Than Ngo <than at redhat.com>
Date: Sat Aug 4 00:30:38 2012 +0200
fix ksystemlog to find log files correctly
kdeadmin-4.8.4-syslog.patch | 103 +++++++++++++++++++++++++++++++++++++++++++
kdeadmin.spec | 15 +++++--
2 files changed, 114 insertions(+), 4 deletions(-)
---
diff --git a/kdeadmin-4.8.4-syslog.patch b/kdeadmin-4.8.4-syslog.patch
new file mode 100644
index 0000000..862d793
--- /dev/null
+++ b/kdeadmin-4.8.4-syslog.patch
@@ -0,0 +1,103 @@
+diff -up kdeadmin-4.8.4/ksystemlog/CMakeLists.txt.me kdeadmin-4.8.4/ksystemlog/CMakeLists.txt
+--- kdeadmin-4.8.4/ksystemlog/CMakeLists.txt.me 2012-06-25 18:04:03.193513825 +0200
++++ kdeadmin-4.8.4/ksystemlog/CMakeLists.txt 2012-06-25 18:25:45.431254383 +0200
+@@ -37,7 +37,6 @@ add_subdirectory(src/modes/xorg)
+ add_subdirectory(src/modes/cron)
+ add_subdirectory(src/modes/authentication)
+ add_subdirectory(src/modes/daemon)
+-add_subdirectory(src/modes/acpid)
+ add_subdirectory(src/modes/xsession)
+ add_subdirectory(src/modes/apache)
+ add_subdirectory(src/modes/postfix)
+diff -up kdeadmin-4.8.4/ksystemlog/src/modes/acpid/acpidConfiguration.h.me kdeadmin-4.8.4/ksystemlog/src/modes/acpid/acpidConfiguration.h
+diff -up kdeadmin-4.8.4/ksystemlog/src/modes/apache/apacheConfiguration.h.me kdeadmin-4.8.4/ksystemlog/src/modes/apache/apacheConfiguration.h
+--- kdeadmin-4.8.4/ksystemlog/src/modes/apache/apacheConfiguration.h.me 2012-06-25 17:11:26.828888800 +0200
++++ kdeadmin-4.8.4/ksystemlog/src/modes/apache/apacheConfiguration.h 2012-06-25 17:18:26.705214338 +0200
+@@ -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/httpd/error_log" );
+ configuration->addItemStringList(QLatin1String( "ApacheLogFilesPaths" ), d->apachePaths, defaultApachePaths, QLatin1String( "ApacheLogFilesPaths" ));
+
+ QStringList defaultApacheAccessPaths;
+- defaultApacheAccessPaths << QLatin1String( "/var/log/apache2/access.log" );
++ defaultApacheAccessPaths << QLatin1String( "/var/log/httpd/access_log" );
+ configuration->addItemStringList(QLatin1String( "ApacheAccessLogFilesPaths" ), d->apacheAccessPaths, defaultApacheAccessPaths, QLatin1String( "ApacheAccessLogFilesPaths" ));
+ }
+
+diff -up kdeadmin-4.8.4/ksystemlog/src/modes/authentication/authenticationConfiguration.h.me kdeadmin-4.8.4/ksystemlog/src/modes/authentication/authenticationConfiguration.h
+--- kdeadmin-4.8.4/ksystemlog/src/modes/authentication/authenticationConfiguration.h.me 2012-06-25 17:00:17.778941985 +0200
++++ kdeadmin-4.8.4/ksystemlog/src/modes/authentication/authenticationConfiguration.h 2012-06-25 17:00:51.600937842 +0200
+@@ -51,7 +51,7 @@ class AuthenticationConfiguration : publ
+
+ configuration->setCurrentGroup(QLatin1String( "AuthenticationLogMode" ));
+
+- QString defaultAuthenticationPath(QLatin1String( "/var/log/auth.log" ));
++ QString defaultAuthenticationPath(QLatin1String( "/var/log/secure" ));
+ configuration->addItemString(QLatin1String( "LogFilePath" ), d->authenticationPath, defaultAuthenticationPath, QLatin1String( "LogFilePath" ));
+
+ QStringList defaultWarningKeywords;
+diff -up kdeadmin-4.8.4/ksystemlog/src/modes/cron/cronConfiguration.h.me kdeadmin-4.8.4/ksystemlog/src/modes/cron/cronConfiguration.h
+--- kdeadmin-4.8.4/ksystemlog/src/modes/cron/cronConfiguration.h.me 2012-06-25 17:09:06.967895663 +0200
++++ kdeadmin-4.8.4/ksystemlog/src/modes/cron/cronConfiguration.h 2012-06-25 17:10:26.269891548 +0200
+@@ -51,7 +51,7 @@ class CronConfiguration : public LogMode
+ configuration->setCurrentGroup(QLatin1String( "CronLogMode" ));
+
+ QStringList defaultCronPaths;
+- defaultCronPaths << QLatin1String( "/var/log/syslog" );
++ defaultCronPaths << QLatin1String( "/var/log/cron" );
+ configuration->addItemStringList(QLatin1String( "LogFilesPaths" ), d->cronPaths, defaultCronPaths, QLatin1String( "LogFilesPaths" ));
+
+ QString defaultProcessFilter(QLatin1String( "/usr/sbin/cron" ));
+diff -up kdeadmin-4.8.4/ksystemlog/src/modes/cups/cupsConfiguration.h.me kdeadmin-4.8.4/ksystemlog/src/modes/cups/cupsConfiguration.h
+--- kdeadmin-4.8.4/ksystemlog/src/modes/cups/cupsConfiguration.h.me 2012-06-25 17:34:11.357046570 +0200
++++ kdeadmin-4.8.4/ksystemlog/src/modes/cups/cupsConfiguration.h 2012-06-25 17:35:21.010324845 +0200
+@@ -65,10 +65,6 @@ class CupsConfiguration : public LogMode
+ QStringList defaultCupsPagePaths;
+ defaultCupsPagePaths << QLatin1String( "/var/log/cups/page_log" );
+ configuration->addItemStringList(QLatin1String( "CupsPageLogFilesPaths" ), d->cupsPagePaths, defaultCupsPagePaths, QLatin1String( "CupsPageLogFilesPaths" ));
+-
+- QStringList defaultCupsPdfPaths;
+- defaultCupsPdfPaths << QLatin1String( "/var/log/cups/cups-pdf_log" );
+- configuration->addItemStringList(QLatin1String( "CupsPdfLogFilesPaths" ), d->cupsPdfPaths, defaultCupsPdfPaths, QLatin1String( "CupsPdfLogFilesPaths" ));
+ }
+
+ virtual ~CupsConfiguration() {
+diff -up kdeadmin-4.8.4/ksystemlog/src/modes/daemon/daemonConfiguration.h.me kdeadmin-4.8.4/ksystemlog/src/modes/daemon/daemonConfiguration.h
+--- kdeadmin-4.8.4/ksystemlog/src/modes/daemon/daemonConfiguration.h.me 2012-06-25 17:07:22.352902065 +0200
++++ kdeadmin-4.8.4/ksystemlog/src/modes/daemon/daemonConfiguration.h 2012-06-25 17:07:52.213900121 +0200
+@@ -47,7 +47,7 @@ class DaemonConfiguration : public LogMo
+ configuration->setCurrentGroup(QLatin1String( "DaemonLogMode" ));
+
+ QStringList defaultDaemonPaths;
+- defaultDaemonPaths << QLatin1String( "/var/log/daemon.log" );
++ defaultDaemonPaths << QLatin1String( "/var/log/boot.log" );
+ configuration->addItemStringList(QLatin1String( "LogFilesPaths" ), d->daemonPaths, defaultDaemonPaths, QLatin1String( "LogFilesPaths" ));
+
+ }
+diff -up kdeadmin-4.8.4/ksystemlog/src/modes/postfix/postfixConfiguration.h.me kdeadmin-4.8.4/ksystemlog/src/modes/postfix/postfixConfiguration.h
+--- kdeadmin-4.8.4/ksystemlog/src/modes/postfix/postfixConfiguration.h.me 2012-06-25 17:18:42.235146563 +0200
++++ kdeadmin-4.8.4/ksystemlog/src/modes/postfix/postfixConfiguration.h 2012-06-25 17:25:01.477653691 +0200
+@@ -39,7 +39,7 @@ class PostfixConfiguration : public Gene
+ PostfixConfiguration() :
+ GenericLogModeConfiguration(
+ QLatin1String( POSTFIX_LOG_MODE_ID ),
+- QStringList() << QLatin1String( "/var/log/mail.log" ) << QLatin1String( "/var/log/mail.info" ) << QLatin1String( "/var/log/mail.warn" ) << QLatin1String( "/var/log/mail.err" ),
++ QStringList() << QLatin1String( "/var/log/maillog" ),
+ QList<int>() << NOTICE_LOG_LEVEL_ID << INFORMATION_LOG_LEVEL_ID << WARNING_LOG_LEVEL_ID << ERROR_LOG_LEVEL_ID
+ ) {
+
+diff -up kdeadmin-4.8.4/ksystemlog/src/modes/system/systemConfiguration.h.me kdeadmin-4.8.4/ksystemlog/src/modes/system/systemConfiguration.h
+--- kdeadmin-4.8.4/ksystemlog/src/modes/system/systemConfiguration.h.me 2012-06-25 16:57:32.116960717 +0200
++++ kdeadmin-4.8.4/ksystemlog/src/modes/system/systemConfiguration.h 2012-06-25 16:58:51.209953475 +0200
+@@ -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
+ ) {
+
diff --git a/kdeadmin.spec b/kdeadmin.spec
index 9c553e2..f53808b 100644
--- a/kdeadmin.spec
+++ b/kdeadmin.spec
@@ -1,4 +1,3 @@
-
%if 0%{?fedora}
%define system_config_printer_kde 1
%endif
@@ -6,8 +5,8 @@
Name: kdeadmin
Summary: KDE Administrative tools
Epoch: 7
-Version: 4.9.0
-Release: 1%{?dist}
+Version: 4.9.0
+Release: 2%{?dist}
Group: User Interface/Desktops
License: GPLv2
@@ -26,6 +25,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# as a temporary hack, but what really needs to happen is fixing authconn.py
Patch0: kdeadmin-4.6.2-kcmprinter_root_privs.patch
+# fix ksystemlog to find log files correctly
+Patch1: kdeadmin-4.8.4-syslog.patch
+
## upstreamable patches
# Can this one be upstreamed? It is not upstreamed at this time.
Patch50: kdeadmin-4.7.1-printing.patch
@@ -67,6 +69,7 @@ a CUPS print server.
%setup -q -n kdeadmin-%{version}
%patch0 -p1 -b .kcmprinter_root_privs.patch
+%patch1 -p1 -b .ksystemlog
%patch50 -p1 -b .printing
%if ! 0%{?system_config_printer_kde}
@@ -124,7 +127,6 @@ fi
%{_kde4_docdir}/HTML/en/kcron/
%{_kde4_docdir}/HTML/en/ksystemlog/
%{_kde4_docdir}/HTML/en/kuser/
-%{_kde4_docdir}/HTML/en/system-config-printer-kde/
%{_kde4_iconsdir}/hicolor/*/*/kuser.*
%{_kde4_libdir}/kde4/kcm_cron.so
@@ -133,10 +135,15 @@ fi
%defattr(-,root,root,-)
%{_kde4_datadir}/kde4/services/system-config-printer-kde.desktop
%{_kde4_appsdir}/system-config-printer-kde/
+%{_kde4_docdir}/HTML/en/system-config-printer-kde/
%endif
%changelog
+* Sat Aug 04 2012 Than Ngo <than at redhat.com> - 7:4.9.0-2
+- fix ksystemlog to find log files correctly
+- mv s*c*p-kde docs in subpackage system-config-printer-kde
+
* Thu Jul 26 2012 Lukas Tinkl <ltinkl at redhat.com> - 7:4.9.0-1
- 4.9.0
More information about the scm-commits
mailing list