From 49333b3f4c26cea610f771fb22883adafd0b8562f9fecc9e060fe53448d610e3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 11 Nov 2015 09:31:34 +0000 Subject: [PATCH] Accepting request 343328 from KDE:Extra 1 OBS-URL: https://build.opensuse.org/request/show/343328 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsibreak?expand=0&rev=30 --- rsibreak-0.11.tar.bz2 | 3 -- rsibreak-0.12.tar.xz | 3 ++ rsibreak.changes | 9 +++++ rsibreak.spec | 76 +++++++++++++++++++++---------------------- 4 files changed, 50 insertions(+), 41 deletions(-) delete mode 100644 rsibreak-0.11.tar.bz2 create mode 100644 rsibreak-0.12.tar.xz diff --git a/rsibreak-0.11.tar.bz2 b/rsibreak-0.11.tar.bz2 deleted file mode 100644 index 884eb17..0000000 --- a/rsibreak-0.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc224812c4554209a9cbba830078cee727ed1a5a3c8cb2109cbac78af2382efb -size 463748 diff --git a/rsibreak-0.12.tar.xz b/rsibreak-0.12.tar.xz new file mode 100644 index 0000000..42aa2a4 --- /dev/null +++ b/rsibreak-0.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c6b579e4287dced4b56d81fcb28f6f12130522fdd4358d36ed5ac24f0848ce1 +size 388204 diff --git a/rsibreak.changes b/rsibreak.changes index 37dabe9..380504b 100644 --- a/rsibreak.changes +++ b/rsibreak.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Nov 9 20:01:26 UTC 2015 - tchvatal@suse.com + +- Version bump to 0.12: + * KF5 based version + * Basically quite rewrite + * No plasma widget anymore + * Works with plasma5 + ------------------------------------------------------------------- Wed Jul 24 19:17:11 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/rsibreak.spec b/rsibreak.spec index 45a1b46..c8a787f 100644 --- a/rsibreak.spec +++ b/rsibreak.spec @@ -1,7 +1,7 @@ # # spec file for package rsibreak # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,21 +17,36 @@ Name: rsibreak -Version: 0.11 +Version: 0.12 Release: 0 Summary: Assists in the Recovery and Prevention of Repetitive Strain Injury License: GPL-2.0+ Group: Productivity/Other -Url: http://www.kde-apps.org/content/show.php?content=29725 -Source: rsibreak-%{version}.tar.bz2 +Url: https://userbase.kde.org/RSIBreak +Source0: http://download.kde.org/stable/rsibreak/%{version}/rsibreak-%{version}.tar.xz +BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: libkde4-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +BuildRequires: kiconthemes-devel +BuildRequires: kidletime-devel +BuildRequires: knotifications-devel +BuildRequires: knotifyconfig-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kwindowsystem-devel +BuildRequires: kxmlgui-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5DBus) >= 5.3.0 +BuildRequires: pkgconfig(Qt5X11Extras) >= 5.3.0 +Requires: hicolor-icon-theme +Recommends: %{name}-lang = %{version} +# REMOVE AFTER Leap 42.1 is out of scope Provides: kde4-rsibreak = %{version} Obsoletes: kde4-rsibreak < %{version} -Suggests: %{name}-doc = %{version} -Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Repetitive Strain Injury is an illness which can occur as a result of @@ -47,55 +62,40 @@ Requires: %{name} = %{version} This package provides documentation for %{name} %lang_package + %prep -%setup -n rsibreak-%{version} -q +%setup -q -n rsibreak-%{version} %build - %cmake_kde4 -d build - %make_jobs +%cmake_kf5 -d build +%make_jobs %install - cd build - %make_install - cd .. - %find_lang %{name} --all-name - %suse_update_desktop_file -G "RSI Prevention" rsibreak TimeUtility - %suse_update_desktop_file %{buildroot}%{_kde4_servicesdir}/plasma-applet-rsibreak.desktop - %suse_update_desktop_file %{buildroot}%{_kde4_servicesdir}/plasma-engine-rsibreak.desktop - %suse_update_desktop_file %{buildroot}%{_datadir}/autostart/rsibreak.desktop - %fdupes -s %{buildroot}%{_datadir} +%kf5_makeinstall -C build +%suse_update_desktop_file -G "RSI Prevention" rsibreak TimeUtility +%find_lang %{name} --all-name +%fdupes -s %{buildroot}%{_datadir} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files doc %defattr(-,root,root) -%doc %{_kde4_htmldir} +%doc %{_kf5_htmldir} %files lang -f %{name}.lang %defattr(-,root,root) -%exclude %{_kde4_htmldir} +%exclude %{_kf5_htmldir} %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING -%{_datadir}/autostart/rsibreak.desktop +%{_sysconfdir}/xdg/autostart/rsibreak_autostart.desktop %{_datadir}/dbus-1/interfaces/org.rsibreak.rsiwidget.xml -%{_kde4_appsdir}/rsibreak -%dir %{_kde4_appsdir}/desktoptheme -%dir %{_kde4_appsdir}/desktoptheme/default -%dir %{_kde4_appsdir}/desktoptheme/default/widgets -%{_kde4_appsdir}/desktoptheme/default/widgets/rsibreak.svg -%{_kde4_applicationsdir}/rsibreak.desktop -%{_kde4_bindir}/rsibreak -%{_kde4_iconsdir}/hicolor/*/*/* -%{_kde4_modulesdir}/plasma_applet_rsibreak.so -%{_kde4_modulesdir}/plasma_engine_rsibreak.so -%{_kde4_servicesdir}/plasma-applet-rsibreak.desktop -%{_kde4_servicesdir}/plasma-engine-rsibreak.desktop +%{_kf5_applicationsdir}/rsibreak.desktop +%{_kf5_notifydir}/rsibreak.notifyrc +%{_kf5_bindir}/rsibreak +%{_kf5_iconsdir}/hicolor/*/*/* %changelog