From 9de87531f59c5e1f907ed7e3447341fc81756bff047c82350ca6a466f884c581 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 3 Dec 2016 13:53:59 +0000 Subject: [PATCH] Accepting request 443411 from home:luca_b:test_KA KDE Applications - please review OBS-URL: https://build.opensuse.org/request/show/443411 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksystemlog?expand=0&rev=42 --- ksystemlog-16.08.3.tar.xz | 3 -- ksystemlog-16.11.80.tar.xz | 3 ++ ksystemlog.changes | 8 ++++++ ksystemlog.spec | 57 +++++++++++++++++--------------------- 4 files changed, 37 insertions(+), 34 deletions(-) delete mode 100644 ksystemlog-16.08.3.tar.xz create mode 100644 ksystemlog-16.11.80.tar.xz diff --git a/ksystemlog-16.08.3.tar.xz b/ksystemlog-16.08.3.tar.xz deleted file mode 100644 index e867f05..0000000 --- a/ksystemlog-16.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:181a217e7a40abed60575d95c466666f7a26c27d7143b35df91c96496a5abdb0 -size 350324 diff --git a/ksystemlog-16.11.80.tar.xz b/ksystemlog-16.11.80.tar.xz new file mode 100644 index 0000000..109d2ca --- /dev/null +++ b/ksystemlog-16.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df99d4185d75ea4617d7a8fc0d5b134901d3a533f6614ce5f4297f68d49614ed +size 350984 diff --git a/ksystemlog.changes b/ksystemlog.changes index 6a34d0c..7e5c2f5 100644 --- a/ksystemlog.changes +++ b/ksystemlog.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 29 12:37:06 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.11.80 + * KDE Applications 16.12.0 Beta + * https://www.kde.org/announcements/announce-applications-16.12-beta.php + + ------------------------------------------------------------------- Wed Nov 9 06:23:25 UTC 2016 - lbeltrame@kde.org diff --git a/ksystemlog.spec b/ksystemlog.spec index 5f41ea1..33bd1c3 100644 --- a/ksystemlog.spec +++ b/ksystemlog.spec @@ -17,36 +17,27 @@ Name: ksystemlog -BuildRequires: extra-cmake-modules >= 1.7.0 -BuildRequires: kf5-filesystem -BuildRequires: oxygen-icon-theme-large -BuildRequires: update-desktop-files -BuildRequires: xz -BuildRequires: cmake(KF5Archive) >= 5.0.0 -BuildRequires: cmake(KF5Completion) >= 5.0.0 -BuildRequires: cmake(KF5Config) >= 5.0.0 -BuildRequires: cmake(KF5CoreAddons) >= 5.0.0 -BuildRequires: cmake(KF5DocTools) >= 5.0.0 -BuildRequires: cmake(KF5I18n) >= 5.0.0 -BuildRequires: cmake(KF5IconThemes) >= 5.0.0 -BuildRequires: cmake(KF5ItemViews) >= 5.0.0 -BuildRequires: cmake(KF5KIO) >= 5.0.0 -BuildRequires: cmake(KF5TextWidgets) >= 5.0.0 -BuildRequires: cmake(KF5WidgetsAddons) >= 5.0.0 -BuildRequires: cmake(KF5XmlGui) >= 5.0.0 -BuildRequires: cmake(Qt5Concurrent) >= 5.2.0 -BuildRequires: cmake(Qt5Core) >= 5.2.0 -BuildRequires: cmake(Qt5PrintSupport) >= 5.2.0 -BuildRequires: cmake(Qt5Test) >= 5.2.0 -BuildRequires: cmake(Qt5Widgets) >= 5.2.0 -BuildRequires: pkgconfig(libsystemd-journal) -Url: http://www.kde.org -Version: 16.08.3 +Version: 16.11.80 Release: 0 +%define kf5_version 5.26.0 +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: System Log Viewer Tool License: GPL-2.0 Group: System/Monitoring +Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +BuildRequires: extra-cmake-modules +BuildRequires: kdelibs4support-devel +BuildRequires: oxygen5-icon-theme-large +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: xz +BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +Obsoletes: ksystemlog5 < %{version} +Provides: ksystemlog5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,10 +46,8 @@ how to find information about their Linux system and how the log files are in their computer. But it is also designed for advanced users, who want to quickly see problems occurring on their server. - - %prep -%setup -q -n %{name}-%{version} +%setup -q %build %cmake_kf5 -d build @@ -68,11 +57,17 @@ want to quickly see problems occurring on their server. %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/ \ - || cp /usr/share/icons/oxygen/base/${i}x${i}/apps/utilities-log-viewer.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/${i}x${i}/apps/ + mkdir -p %{buildroot}%{_datadir}/icons/hicolor/"$i"x"$i"/apps +%if 0%{?suse_version} > 1320 + cp %{_datadir}/icons/oxygen/base/"$i"x"$i"/apps/utilities-log-viewer.png %{buildroot}%{_datadir}/icons/hicolor/"$i"x"$i"/apps/; +%else + cp %{_datadir}/icons/oxygen/"$i"x"$i"/apps/utilities-log-viewer.png %{buildroot}%{_datadir}/icons/hicolor/"$i"x"$i"/apps/; +%endif done +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc COPYING