Accepting request 350061 from KDE:Applications
Update to KDE Applications 15.12.0 OBS-URL: https://build.opensuse.org/request/show/350061 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ksystemlog?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3cbc04d19a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fd34a99d8cdee9ddabc7372c4aa4b63ce788c4fe5bd48487a5d998a17c67ea89
|
||||
size 381832
|
||||
3
ksystemlog-15.12.0.tar.xz
Normal file
3
ksystemlog-15.12.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:629f20c8d4725866b5e4b51153a2e1f9f8b119b7b5d8369f8d401acb9cca0abf
|
||||
size 395508
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- Drop patch ksystemlog_suse_log_locations.diff as this is no longer
|
||||
applicable.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 10 20:17:35 UTC 2015 - tittiatcoke@gmail.com
|
||||
|
||||
|
||||
@ -17,18 +17,22 @@
|
||||
|
||||
|
||||
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.08.3
|
||||
Version: 15.12.0
|
||||
Release: 0
|
||||
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
|
||||
|
||||
%description
|
||||
This program is developed for use by beginner users, who do not know
|
||||
@ -40,18 +44,14 @@ want to quickly see problems occurring on their server.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1 -p1
|
||||
|
||||
%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/;
|
||||
@ -67,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
|
||||
|
||||
@ -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
|
||||
) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user