From 911b2775be904b564585486f29b437fbf6779e288930ec7fae799281e8feae8e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 27 Apr 2015 20:08:54 +0000 Subject: [PATCH] Accepting request 304181 from KDE:Applications Update to KDE Applications 15.04. Obsolete devel package OBS-URL: https://build.opensuse.org/request/show/304181 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/khangman?expand=0&rev=55 --- khangman-15.04.0.tar.xz | 3 ++ khangman-4.14.3.tar.xz | 3 -- khangman.changes | 72 +++++++++++++++++++++++++++ khangman.spec | 105 +++++++++++++++++----------------------- 4 files changed, 120 insertions(+), 63 deletions(-) create mode 100644 khangman-15.04.0.tar.xz delete mode 100644 khangman-4.14.3.tar.xz diff --git a/khangman-15.04.0.tar.xz b/khangman-15.04.0.tar.xz new file mode 100644 index 0000000..faf8bc6 --- /dev/null +++ b/khangman-15.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05a4dcdd44e9ab0cd7e10a2452cd24cc4e2f72a4670f065ee6213cd80d8cca32 +size 3919808 diff --git a/khangman-4.14.3.tar.xz b/khangman-4.14.3.tar.xz deleted file mode 100644 index a2ab76b..0000000 --- a/khangman-4.14.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d7e721a72d1477f630af985c88658a677c1ec8d380d3a6f838b6aa71f75ad71 -size 3945696 diff --git a/khangman.changes b/khangman.changes index 2a689e7..474a80b 100644 --- a/khangman.changes +++ b/khangman.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Mon Apr 20 10:41:59 UTC 2015 - wbauer@tmo.at + +- Do not require libkhangmanengine5, this doesn't exist any more + +------------------------------------------------------------------- +Sat Apr 11 13:55:45 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 18:59:03 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:59:17 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- +Tue Mar 3 10:50:29 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.3 + * KDE Applications 14.12.3 + * See https://www.kde.org/announcements/announce-applications-14.12.3.php + +------------------------------------------------------------------- +Sun Feb 1 11:26:24 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.2 + * KDE Applications 14.12.2 + * See https://www.kde.org/announcements/announce-applications-14.12.2.php + +------------------------------------------------------------------- +Mon Jan 12 20:16:40 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.1 + * KDE Applications 14.12.1 + * See https://www.kde.org/announcements/announce-applications-14.12.1.php + +- Add also a conflict for the devel package. + +------------------------------------------------------------------- +Wed Dec 17 20:44:08 UTC 2014 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.0 + * KDE Applications 14.12.0 + * See https://www.kde.org/announcements/announce-applications-14.12.0.php + +------------------------------------------------------------------- +Wed Dec 17 20:18:27 UTC 2014 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.0 + * KDE Applications 14.12.0 + * See https://www.kde.org/announcements/announce-applications-14.12.0.php + +------------------------------------------------------------------- +Wed Dec 3 07:55:28 UTC 2014 - tittiatcoke@gmail.com + +Update to KDE Applications 14.11.97 + * KDE Applications 14.12 Release Candidate + * See http://www.kde.org/announcements/announce-applications-14.12-rc.php + * KHangman is now KDE Frameworks based + ------------------------------------------------------------------- Sun Nov 9 20:33:53 UTC 2014 - tittiatcoke@gmail.com diff --git a/khangman.spec b/khangman.spec index 54018ee..64f3a67 100644 --- a/khangman.spec +++ b/khangman.spec @@ -1,7 +1,7 @@ # # spec file for package khangman # -# Copyright (c) 2014 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,85 +17,70 @@ Name: khangman -Version: 4.14.3 +Version: 15.04.0 Release: 0 Summary: Hangman Game License: GPL-2.0+ Group: Amusements/Teaching/Language Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -BuildRequires: libkde4-devel -BuildRequires: libkdeedu4-devel -BuildRequires: xz -Requires: libkhangmanengine4 >= %version -Provides: kde4-khangman = 4.3.0 -Obsoletes: kde4-khangman < 4.3.0 +BuildRequires: kcompletion-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel +BuildRequires: kdoctools-devel +BuildRequires: kf5-filesystem +BuildRequires: ki18n-devel +BuildRequires: knewstuff-devel +BuildRequires: knotifications-devel +BuildRequires: kxmlgui-devel +BuildRequires: libkeduvocdocument-devel +BuildRequires: phonon4qt5-devel +BuildRequires: kdeclarative-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Svg) +Conflicts: khangman +Requires: kdeedu-data +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +Obsoletes: khangman5 < %{version} +Obsoletes: khangman-devel < %{version} +Obsoletes: libkhangmanengine5 < %{version} %description Classical hangman game for KDE. -%package devel -Summary: Khangman engine library - Development Files -Group: Development/Libraries/KDE -Requires: libkde4-devel -Requires: libkhangmanengine4 = %version - -%description devel -This package contains development files for the KHangman engine library. - -%package -n libkhangmanengine4 -Summary: Khangman Engine library -Group: Productivity/Graphics/Other - -%description -n libkhangmanengine4 -This package contains a library for the Khangman game. - %prep -%setup -q +%setup -q -n %{name}-%{version} %build -%ifarch ppc ppc64 -export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" -%endif - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - %kde4_makeinstall -C build - %kde_post_install - -%post -n libkhangmanengine4 -p /sbin/ldconfig - -%postun -n libkhangmanengine4 -p /sbin/ldconfig + %kf5_makeinstall -C build %files %defattr(-,root,root) %doc COPYING* AUTHORS ChangeLog README -%dir %{_kde4_datadir}/appdata -%dir %{_kde4_iconsdir}/hicolor/80x80 -%dir %{_kde4_iconsdir}/hicolor/80x80/apps -%doc %{_kde4_htmldir}/en/khangman/ -%doc %{_kde4_mandir}/man6/khangman.6.gz -%{_kde4_applicationsdir}/khangman.desktop -%{_kde4_appsdir}/khangman/ -%{_kde4_bindir}/khangman -%{_kde4_configdir}/khangman.knsrc -%{_kde4_configkcfgdir}/khangman.kcfg -%{_kde4_datadir}/appdata/khangman.appdata.xml -%{_kde4_iconsdir}/hicolor/*/apps/khangman-harmattan.* -%{_kde4_iconsdir}/hicolor/*/apps/khangman.* - -%files devel -%defattr(-,root,root) -# FIXME check with upstream why they deviate from KDE4Defaults -%{_includedir}/khangman/ -%{_kde4_libdir}/libkhangmanengine.so - -%files -n libkhangmanengine4 -%defattr(-,root,root) -%doc COPYING -%{_kde4_libdir}/libkhangmanengine.so.* +%dir %{_kf5_iconsdir}/hicolor/80x80 +%dir %{_kf5_iconsdir}/hicolor/80x80/apps +%doc %{_kf5_htmldir}/en/khangman/ +%doc %{_kf5_mandir}/man6/khangman.6.gz +%{_kf5_applicationsdir}/org.kde.khangman.desktop +%{_kf5_sharedir}/khangman/ +%{_kf5_bindir}/khangman +%config %{_kf5_configdir}/khangman.knsrc +%dir %{_kf5_configkcfgdir} +%{_kf5_configkcfgdir}/khangman.kcfg +%{_kf5_sharedir}/appdata/ +%{_kf5_iconsdir}/hicolor/*/apps/khangman-harmattan.* +%{_kf5_iconsdir}/hicolor/*/apps/khangman.* %changelog