diff --git a/diskmonitor-0.3.1.zip b/diskmonitor-0.3.1.zip deleted file mode 100644 index c1bd409..0000000 --- a/diskmonitor-0.3.1.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eee2f1a30be0668d3dc3443861b7803c3196c4936764e79f613d0739900e4fff -size 117746 diff --git a/diskmonitor-0.3.2.tar.gz b/diskmonitor-0.3.2.tar.gz new file mode 100644 index 0000000..1202e49 --- /dev/null +++ b/diskmonitor-0.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37a1c0c3cf86a5794a676057b727a73c22bea15f5381ea0b92e26e0e384c591f +size 54065 diff --git a/diskmonitor-desktop.patch b/diskmonitor-desktop.patch index 3ed2690..9f2e90c 100644 --- a/diskmonitor-desktop.patch +++ b/diskmonitor-desktop.patch @@ -1,5 +1,7 @@ ---- app/diskmonitor.desktop.orig 2015-04-11 00:09:26.673471620 +0200 -+++ app/diskmonitor.desktop 2015-04-11 00:09:26.688471616 +0200 +diff --git a/app/diskmonitor.desktop b/app/diskmonitor.desktop +index a24b401..3afa79d 100644 +--- a/app/diskmonitor.desktop ++++ b/app/diskmonitor.desktop @@ -2,8 +2,10 @@ Name=DisKMonitor GenericName=Tool to monitor SMART devices and MDRaid health status diff --git a/diskmonitor-installdirs.patch b/diskmonitor-installdirs.patch index 045821b..1fde32e 100644 --- a/diskmonitor-installdirs.patch +++ b/diskmonitor-installdirs.patch @@ -1,6 +1,8 @@ ---- app/CMakeLists.txt.orig 2015-04-11 00:09:29.086470863 +0200 -+++ app/CMakeLists.txt 2015-04-11 00:09:29.108470874 +0200 -@@ -34,7 +34,7 @@ +diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt +index 20afc5e..f1f31b5 100644 +--- a/app/CMakeLists.txt ++++ b/app/CMakeLists.txt +@@ -34,7 +34,7 @@ target_link_libraries( diskmonitor KF5::XmlGui ) diff --git a/diskmonitor-underlinking.patch b/diskmonitor-underlinking.patch deleted file mode 100644 index e23d751..0000000 --- a/diskmonitor-underlinking.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- settings/CMakeLists.txt.orig 2015-03-30 15:57:26.000000000 +0200 -+++ settings/CMakeLists.txt 2015-04-08 13:29:50.210201000 +0200 -@@ -20,6 +20,7 @@ - target_link_libraries( libsettings - Qt5::Core - KF5::ConfigWidgets -+ KF5::I18n - KF5::IconThemes - ) - diff --git a/diskmonitor.changes b/diskmonitor.changes index 8729075..1a6d30e 100644 --- a/diskmonitor.changes +++ b/diskmonitor.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 25 18:39:41 UTC 2018 - christophe@krop.fr + +- Update to 0.3.2. + * Fix compilation problem with KLocalizedString +- Drop diskmonitor-underlinking.patch (fixed upstream) + ------------------------------------------------------------------- Sat Nov 5 18:19:37 UTC 2016 - asterios.dramis@gmail.com diff --git a/diskmonitor.spec b/diskmonitor.spec index 224c99a..b10393a 100644 --- a/diskmonitor.spec +++ b/diskmonitor.spec @@ -1,7 +1,7 @@ # # spec file for package diskmonitor # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) - Name: diskmonitor -Summary: KDE tools to monitor SMART devices and MDRaid health status -Version: 0.3.1 +Version: 0.3.2 Release: 0 -Url: https://github.com/papylhomme/diskmonitor -Source0: https://github.com/papylhomme/diskmonitor/archive/%{version}.zip#/%{name}-%{version}.zip -Patch0: diskmonitor-underlinking.patch +Summary: Tools to monitor SMART devices and MDRaid health status +License: GPL-2.0-only +Group: Hardware/Other +URL: https://github.com/papylhomme/diskmonitor +Source0: https://github.com/papylhomme/diskmonitor/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch1: diskmonitor-desktop.patch Patch2: diskmonitor-installdirs.patch -License: GPL-2.0 -Group: Hardware/Other +BuildRequires: extra-cmake-modules +BuildRequires: fdupes +BuildRequires: unzip +BuildRequires: update-desktop-files BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5I18n) @@ -40,17 +40,12 @@ BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Quick) BuildRequires: cmake(Qt5Widgets) -BuildRequires: extra-cmake-modules -BuildRequires: update-desktop-files -BuildRequires: unzip -BuildRequires: fdupes Requires: udisks2 >= 2.1 Requires: xdg-utils Recommends: diskmonitor-lang = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -KDE tools to monitor SMART devices and MDRaid health status. +Tools to monitor SMART devices and MDRaid health status. Features a full application and a Plasma applet. Application: @@ -70,10 +65,7 @@ Applet: %lang_package %prep -%setup -q -%patch0 -%patch1 -%patch2 +%autosetup -p1 %build %cmake_kf5 -d build @@ -88,25 +80,20 @@ Applet: %fdupes %{buildroot} %files -%defattr(-,root,root) -%{_kf5_sbindir}/diskmonitor -%dir %{_kf5_qmldir}/org/papylhomme -%dir %{_kf5_qmldir}/org/papylhomme/diskmonitor -%{_kf5_qmldir}/org/papylhomme/diskmonitor/libdiskmonitor_qmlplugins.so -%{_kf5_qmldir}/org/papylhomme/diskmonitor/qmldir -%{_kf5_sharedir}/applications/diskmonitor.desktop -%if 0%{?_appstreamkpackage} +%license LICENSE +%doc README.md CHANGELOG +%dir %{_kf5_qmldir}/org/ %{_kf5_appstreamdir}/org.papylhomme.diskmonitor.appdata.xml -%endif -%dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/diskmonitor.kcfg %{_kf5_iconsdir}/hicolor/scalable/apps/diskmonitor.svg %{_kf5_notifydir}/diskmonitor.notifyrc -%{_kf5_servicesdir}/plasma-applet-org.papylhomme.diskmonitor.desktop %{_kf5_plasmadir}/plasmoids/ -%doc CHANGELOG LICENSE README.md +%{_kf5_qmldir}/org/papylhomme/ +%{_kf5_sbindir}/diskmonitor +%{_kf5_servicesdir}/plasma-applet-org.papylhomme.diskmonitor.desktop +%{_kf5_sharedir}/applications/diskmonitor.desktop + %files lang -f diskmonitor.lang -%defattr(-,root,root) %changelog