rpm/ksudoku
SHA256
1
0
Fork 0
forked from pool/ksudoku
Code Pull Requests Activity

Accepting request 516430 from KDE:Applications

Browse Source 
Update to 17.08.0

OBS-URL: https://build.opensuse.org/request/show/516430
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ksudoku?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2017-08-28 13:08:32 +00:00 committed by Git OBS Bridge
commit 255302608c
5 changed files with 85 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-Revert-Fix-.desktop-Qt5-apps-accept-qwindowtitle-not.patch
View File

@ -1,34 +0,0 @@
From 2e94a775d5ede50821fd5466a7b05422fdf016c3 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sun, 16 Jul 2017 21:07:13 +0200
Subject: [PATCH] Revert "Fix .desktop: Qt5 apps accept qwindowtitle, not
caption"
This reverts commit 672b4e39f22f840034a8e66e1311175639bff3e3 to fix
starting ksudoku via the application menu entry.
ksudoku 17.04.3 is still KDE4/Qt4-based and only supports -caption, not
-qwindowtitle.
See also
https://mail.kde.org/pipermail/release-team/2017-July/010426.html
---
src/gui/org.kde.ksudoku.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gui/org.kde.ksudoku.desktop b/src/gui/org.kde.ksudoku.desktop
index 858688a..626ec59 100755
--- a/src/gui/org.kde.ksudoku.desktop
+++ b/src/gui/org.kde.ksudoku.desktop
@@ -50,7 +50,7 @@ Name[wa]=KSudoku
Name[x-test]=xxKSudokuxx
Name[zh_CN]=KSudoku
Name[zh_TW]=KSudoku
-Exec=ksudoku %i -qwindowtitle %c
+Exec=ksudoku %i -caption %c
Icon=ksudoku
Type=Application
X-DocPath=ksudoku/index.html
--
2.12.3

3
ksudoku-17.04.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1162839b75f7508bd4007fc586c3466565527c3519069bbba636802f7f95a474
size 1434536

3
ksudoku-17.08.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d996ae8d42315ecaa0b17deb4d20c36ea93c976cc3dfaab8ed4e041f5b73dad3
size 1633624

18
ksudoku.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Fri Aug 11 22:46:03 UTC 2017 - christophe@krop.fr
- Update to KDE Applications 17.08.0
* New feature release
* https://www.kde.org/announcements/announce-applications-17.08.0.php
- Changes since 17.04.3 :
- Too many changes to list here
-------------------------------------------------------------------
Sat Aug 5 18:18:50 UTC 2017 - christophe@krop.fr
- Update to KDE Applications 17.07.90
* KDE Applications 17.07.90
* https://www.kde.org/announcements/announce-applications-17.07.90.php
- Drop 0001-Revert-Fix-.desktop-Qt5-apps-accept-qwindowtitle-not.patch
(no longer necessary)
-------------------------------------------------------------------
Sun Jul 16 19:16:05 UTC 2017 - wbauer@tmo.at

88
ksudoku.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ksudoku
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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,21 +16,51 @@
#
%bcond_without lang
Name: ksudoku
BuildRequires: libkdegames4-devel
BuildRequires: xz
BuildRequires: pkgconfig(glu)
Version: 17.08.0
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: Generate and Solve Sudoku puzzles in 2D or 3D
License: GPL-2.0+
Group: Amusements/Games/Board/Puzzle
Url: http://www.kde.org
Version: 17.04.3
Release: 0
Source0: ksudoku-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
Patch: 0001-Revert-Fix-.desktop-Qt5-apps-accept-qwindowtitle-not.patch
BuildRequires: extra-cmake-modules
BuildRequires: kconfig-devel
BuildRequires: kconfigwidgets-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kdbusaddons-devel
BuildRequires: kdelibs4support-devel
BuildRequires: ki18n-devel
BuildRequires: kio-devel
BuildRequires: kitemmodels-devel
BuildRequires: knewstuff-devel
BuildRequires: knotifyconfig-devel
BuildRequires: ktextwidgets-devel
BuildRequires: kwidgetsaddons-devel
BuildRequires: kwindowsystem-devel
BuildRequires: kxmlgui-devel
BuildRequires: libkdegames-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5QuickWidgets)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(glu)
Obsoletes: ksudoku5 < %{version}
Provides: ksudoku5 = %{version}
%if %{with lang}
Recommends: %{name}-lang
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
%description
KSudoku is a program that can generate and solve sudoku puzzles. The
@ -39,31 +69,41 @@ cells are filled with a number at the beginnning: the remaining are to
be filled by the player using numbers from 1 to 9, without repeating a
number twice on each column, row, or subsquare.
%if %{with lang}
%lang_package
%endif
%prep
%setup -q -n ksudoku-%{version}
%patch -p1
%setup -q
%build
%cmake_kde4 -d build
%cmake_kf5 -d build
%make_jobs
%install
cd build
%kde4_makeinstall
%kf5_makeinstall -C build
%if %{with lang}
%find_lang %{name} --with-man --all-name
%kf5_find_htmldocs
%endif
%suse_update_desktop_file -G "Sudoku Puzzles" org.kde.ksudoku Game LogicGame
%kde_post_install
%files
%defattr(-,root,root)
%doc COPYING COPYING.DOC
%{_kde4_bindir}/ksudoku
%{_kde4_htmldir}/en/ksudoku/
%{_kde4_applicationsdir}/org.kde.ksudoku.desktop
%{_kde4_iconsdir}/hicolor/*/apps/ksudoku.*
%{_kde4_appsdir}/ksudoku/
%{_kde4_configdir}/ksudokurc
%dir %{_datadir}/metainfo
%{_datadir}/metainfo/org.kde.ksudoku.appdata.xml
%doc COPYING*
%config %{_kf5_configdir}/ksudokurc
%dir %{_kf5_appstreamdir}
%doc %lang(en) %{_kf5_htmldir}/en/ksudoku/
%{_kf5_applicationsdir}/org.kde.ksudoku.desktop
%{_kf5_appstreamdir}/org.kde.ksudoku.appdata.xml
%{_kf5_bindir}/ksudoku
%{_kf5_iconsdir}/hicolor/*/*/ksudoku*
%{_kf5_kxmlguidir}/ksudoku/
%{_kf5_sharedir}/ksudoku/
%if %{with lang}
%files lang -f %{name}.lang
%doc COPYING*
%endif
%changelog