From 4a5ea8cbcda373a71bad3c26859be3d644ca590f285ca5ab3e8f094773915094 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 8 Aug 2016 09:43:00 +0000 Subject: [PATCH] Accepting request 417372 from home:adra:branches:KDE:Extra Update to 0.12.3, Updated build requirements, Merged doc and lang subpackages OBS-URL: https://build.opensuse.org/request/show/417372 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/rsibreak?expand=0&rev=4 --- rsibreak-0.12.3.tar.xz | 3 +++ rsibreak-0.12.tar.xz | 3 --- rsibreak.changes | 12 ++++++++++++ rsibreak.spec | 38 ++++++++++++++++---------------------- 4 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 rsibreak-0.12.3.tar.xz delete mode 100644 rsibreak-0.12.tar.xz diff --git a/rsibreak-0.12.3.tar.xz b/rsibreak-0.12.3.tar.xz new file mode 100644 index 0000000..1d50df4 --- /dev/null +++ b/rsibreak-0.12.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10cd83d97a823a629c6b2cf6bb81f1fd7dc576c5829381fb1f2babf9328bd926 +size 391016 diff --git a/rsibreak-0.12.tar.xz b/rsibreak-0.12.tar.xz deleted file mode 100644 index 42aa2a4..0000000 --- a/rsibreak-0.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c6b579e4287dced4b56d81fcb28f6f12130522fdd4358d36ed5ac24f0848ce1 -size 388204 diff --git a/rsibreak.changes b/rsibreak.changes index 380504b..ff2f39a 100644 --- a/rsibreak.changes +++ b/rsibreak.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Aug 4 21:55:38 UTC 2016 - asterios.dramis@gmail.com + +- Update to 0.12.3: + * ChangeLog not available. +- Added build requirements kcrash-devel, pkgconfig(Qt5Core), + pkgconfig(Qt5Gui) and pkgconfig(Qt5Widgets). +- Removed build requirement pkgconfig(Qt5X11Extras). +- Merged doc and lang subpackages since doc holds the translated + helpfiles. Moved english help file to main package. Obsolete the + doc subpackage. + ------------------------------------------------------------------- Mon Nov 9 20:01:26 UTC 2015 - tchvatal@suse.com diff --git a/rsibreak.spec b/rsibreak.spec index c8a787f..ecdae81 100644 --- a/rsibreak.spec +++ b/rsibreak.spec @@ -1,7 +1,7 @@ # # spec file for package rsibreak # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,18 +16,20 @@ # +%define base_ver 0.12 Name: rsibreak -Version: 0.12 +Version: 0.12.3 Release: 0 Summary: Assists in the Recovery and Prevention of Repetitive Strain Injury License: GPL-2.0+ Group: Productivity/Other Url: https://userbase.kde.org/RSIBreak -Source0: http://download.kde.org/stable/rsibreak/%{version}/rsibreak-%{version}.tar.xz +Source0: http://download.kde.org/stable/rsibreak/%{base_ver}/rsibreak-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: kconfig-devel BuildRequires: kconfigwidgets-devel +BuildRequires: kcrash-devel BuildRequires: kdbusaddons-devel BuildRequires: kdoctools-devel BuildRequires: ki18n-devel @@ -39,10 +41,13 @@ BuildRequires: ktextwidgets-devel BuildRequires: kwindowsystem-devel BuildRequires: kxmlgui-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.3.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.3.0 +BuildRequires: pkgconfig(Qt5Gui) >= 5.3.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.3.0 Requires: hicolor-icon-theme Recommends: %{name}-lang = %{version} +Obsoletes: %{name}-doc < %{version} # REMOVE AFTER Leap 42.1 is out of scope Provides: kde4-rsibreak = %{version} Obsoletes: kde4-rsibreak < %{version} @@ -53,18 +58,10 @@ Repetitive Strain Injury is an illness which can occur as a result of working with a mouse and keyboard. This utility can be used to remind you to take a break now and then. -%package doc -Summary: Documentation for %{name} -Group: Productivity/Other -Requires: %{name} = %{version} - -%description doc -This package provides documentation for %{name} - %lang_package %prep -%setup -q -n rsibreak-%{version} +%setup -q %build %cmake_kf5 -d build @@ -72,30 +69,27 @@ This package provides documentation for %{name} %install %kf5_makeinstall -C build -%suse_update_desktop_file -G "RSI Prevention" rsibreak TimeUtility +%suse_update_desktop_file -G "RSI Prevention" rsibreak Qt KDE TimeUtility %find_lang %{name} --all-name %fdupes -s %{buildroot}%{_datadir} -%post -p /sbin/ldconfig - +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files doc -%defattr(-,root,root) -%doc %{_kf5_htmldir} - %files lang -f %{name}.lang %defattr(-,root,root) -%exclude %{_kf5_htmldir} +%doc %{_kf5_htmldir} +%exclude %{_kf5_htmldir}/en/ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS ChangeLog COPYING COPYING.DOC NEWS %{_sysconfdir}/xdg/autostart/rsibreak_autostart.desktop %{_datadir}/dbus-1/interfaces/org.rsibreak.rsiwidget.xml %{_kf5_applicationsdir}/rsibreak.desktop %{_kf5_notifydir}/rsibreak.notifyrc %{_kf5_bindir}/rsibreak %{_kf5_iconsdir}/hicolor/*/*/* +%doc %{_kf5_htmldir}/en/ %changelog