SHA256
1
0
forked from pool/libkdegames

Accepting request 938041 from KDE:Applications

KDE Gear 21.12.0

OBS-URL: https://build.opensuse.org/request/show/938041
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libkdegames?expand=0&rev=118
This commit is contained in:
Dominique Leuenberger 2021-12-13 19:43:59 +00:00 committed by Git OBS Bridge
commit f03553cadb
7 changed files with 111 additions and 57 deletions

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmGAgr0ACgkQu0YzUNbv
Me+MTRAAjqy12JDKV0km01C+eXXYdKuZW0rWOrY1eAMoLxyHUrXaFkl567NnSeo/
PtRX0OKYP0jin8N8hXH/HSZZ/d6aJJ5b5aDoifzVv4njExaDLajwEChHCSDKDw1f
vTF/mbT/yzjhKqGZJfPNCh0lQkx0wq56oWiba4GPCEvS6O++8sTMbcFf9yWYIzAY
di9tDi8ilw0jFl8DHEO8Lo4eFXMGQi2SIt92b3MLHOq5k1dTXPrujokO27ir4x0i
gKsD/l7dUOqFeSTRCScRTO6T2CzAOaoskRedGrMe6y/4XrmGu2GZZZfrU5t7lnVn
PrRW1V0bqDKgvRXkBD1fgRcLEwaQSo+ZsVlpqmwxgczZJiC/kZhphrIayYQbA+LL
fRI3NyOa+H/T/5KXRNdPx6NVq+ivKf/H1xzXVvFzGVRTsvbqjIdQg46fcalPjRuZ
RHLeXSQGE799yvcueMAd0rrAqI9KwJxNbEsft2caCzKWDanqj74Bmt+4L23FPav2
uEKi4B2Z9gFBOwqp8tKX2FMZ0xUZFmG3xtPmd4qfN8Ycl/xThQ1e5fkK9ksP7+W7
Joh3gfX9AZRrPVWzAGLjoBWDXBgf8AKbaVz6cPKKoYW+5yQCAaljRI+26kcjGezB
Pc2b60K1bECG2+YPR+JQ5ReiJhT8RjQ3SwY/0TME5e93JxrsXS8=
=lxOl
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmGpY4QACgkQOmpNuDnq
ptcLZg//eaAINvzs+/zVLxCsM/0+sib2einVnpDmp5NTToPzDKddbt8NP5pNfagC
SdQK+ENI+HE6SkEYTtJuMf0H3p8VYip41WhD66f2EtRI+JS0Wkq74QbppnOdvH9T
Pt5sblStKd8znjAQpfqZ1orbRDcR8EJ4NYZAj7PazuiLQtwW3JpQfrC6i2YHw/UE
cEA4VVj0mQOq8BBRnqZvAMH6O7WKjOf1tgngqy3tfJWRQJuupu5K2IM7v4Un0joR
jm2fXbBsS3vbVE4wJXIgUXvqB4CEW5rv4/xE6QuoYct67AvjTDwuehAeQoDIwkwt
naD32b07gKAdrT+27xvaIu9cmmhRCI8Ov2r8qOzbpl9Hlhil6bbWmbplDOFZas11
xF+ecA/15iNzmtBihCMINS3X1wvj5oWTlU2d1iKfUdW3ln91AaZ5DwKCiRjiEabI
hIfjgTW05mClBjutVRCItG+ABwck8HVf+32F/1oBjfVuPFCHqwL3cDQ2yovoJaJp
scY8QbATwDGvNd3N3ijkikQLaavAVAh+XnlAFVav1Os51OxK24OsuM0hLk+BLM9+
/+9EZ2r8tbPdh8tj5lU6o2HvRAOuJ1nqkaP6qmRI/q6uPoN1f9/GspPcrYZ9jX6+
4CEzKeiq1h9oGzTg8H74f9VmBSo3cgD31Rkm33aPPoM+LtQa5/E=
=L6tc
-----END PGP SIGNATURE-----

View File

@ -1,12 +1,12 @@
diff --git a/src/carddecks/CMakeLists.txt b/src/carddecks/CMakeLists.txt
index 2a610a91..676442b0 100644
--- a/src/carddecks/CMakeLists.txt
+++ b/src/carddecks/CMakeLists.txt
@@ -9,7 +9,6 @@ add_subdirectory( svg-dondorf )
add_subdirectory( svg-future )
add_subdirectory( svg-gm-paris )
add_subdirectory( svg-jolly-royal )
-add_subdirectory( svg-konqi-modern )
add_subdirectory( svg-nicu-ornamental )
add_subdirectory( svg-nicu-white )
add_subdirectory( svg-oxygen )
Index: libkdegames-19.11.70git.20210717T045500~9295393e/src/carddecks/CMakeLists.txt
===================================================================
--- libkdegames-19.11.70git.20210717T045500~9295393e.orig/src/carddecks/CMakeLists.txt 2021-07-18 08:22:46.169964318 +0200
+++ libkdegames-19.11.70git.20210717T045500~9295393e/src/carddecks/CMakeLists.txt 2021-07-18 08:23:30.754409031 +0200
@@ -37,7 +37,6 @@
install_carddeck(svg-future PREVIEW 11.png SVG future.svg)
install_carddeck(svg-gm-paris PREVIEW 11.png SVG paris.svg)
install_carddeck(svg-jolly-royal PREVIEW 11.png SVG jolly-royal.svg)
-install_carddeck(svg-konqi-modern PREVIEW 11.png SVG konqi.svg)
install_carddeck(svg-nicu-ornamental PREVIEW 11.png SVG ornamental.svg AUTHORS COPYING)
install_carddeck(svg-nicu-white PREVIEW 11.png SVG white.svg AUTHORS COPYING)
install_carddeck(svg-oxygen PREVIEW 11.png SVG oxygen.svg)

View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
Sun Dec 5 15:43:25 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Use the correct sover in the library package
- Split package into library, Qt/KF-versioned and unversioned parts
- Use %fdupes without -s
- Remove some unneeded BuildReqs
-------------------------------------------------------------------
Fri Dec 3 19:22:49 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.12.0
* New feature release
* For more details please see:
* https://kde.org/announcements/gear/21.12.0/
- No code change since 21.11.90
-------------------------------------------------------------------
Sat Nov 27 10:11:45 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.11.90
* New feature release
- No code change since 21.11.80
-------------------------------------------------------------------
Sat Nov 13 17:56:24 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.11.80
* New feature release
- Changes since 21.08.3:
* .kde-ci: cleanup whitespace
* Fix typo in README
* Remove duplicate includes
* Adjust theme selector sizing to support smaller screens
* Store carddeck files as SVG in repo, compress to SVGZ only on installation
* Bump min CMake/Qt/KF deps to 3.16/5.15/5.85
-------------------------------------------------------------------
Tue Nov 2 21:34:45 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -15,13 +15,12 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define kf5_version 5.60.0
%define sover 7
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: libkdegames
Version: 21.08.3
Version: 21.12.0
Release: 0
Summary: General Data for KDE Games
License: GPL-2.0-or-later
@ -40,25 +39,16 @@ BuildRequires: libsndfile-devel
BuildRequires: openal-soft-devel
BuildRequires: xz
BuildRequires: cmake(KF5Archive)
BuildRequires: cmake(KF5Bookmarks)
BuildRequires: cmake(KF5Codecs)
BuildRequires: cmake(KF5Completion)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5ConfigWidgets)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Crash)
BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5DNSSD)
BuildRequires: cmake(KF5Declarative)
BuildRequires: cmake(KF5GlobalAccel)
BuildRequires: cmake(KF5GuiAddons)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5ItemViews)
BuildRequires: cmake(KF5JobWidgets)
BuildRequires: cmake(KF5NewStuff)
BuildRequires: cmake(KF5Service)
BuildRequires: cmake(KF5TextWidgets)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5XmlGui)
BuildRequires: cmake(Qt5Qml)
@ -69,24 +59,41 @@ BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5Widgets)
Obsoletes: %{name}-kf5 < %{version}
Provides: %{name}-kf5 = %{version}
Conflicts: libkf5kdegames6 < %{version}
# Breaks debuginfo extraction of subpackages
#BuildArch: noarch
%description
This package contains data which is required by the KDE games library.
%package -n libkf5kdegames6
%package qt5-imports
Summary: QML modules for KDE games
License: LGPL-2.1-or-later
Group: System/GUI/KDE
Conflicts: libkf5kdegames6 < %{version}
%description qt5-imports
This package contains QML modules for KDE games.
%package -n libKF5KDEGames%{sover}
Summary: Library for KDE Games
License: LGPL-2.1-or-later
Group: System/GUI/KDE
Requires: libkdegames = %{version}
Requires: libkdegames >= %{version}
Requires: %{name}-qt5-imports >= %{version}
# libkf5kdegames6 actually contained libKF5KDEGames.so.7 at some point,
# so obsolete that explicitly.
Provides: libkf5kdegames6 = %{version}
Obsoletes: libkf5kdegames6 < %{version}
%description -n libkf5kdegames6
%description -n libKF5KDEGames%{sover}
This package contains the KDE games library.
%package devel
Summary: Library for KDE Games: Build Environment
License: LGPL-2.1-or-later
Group: Development/Libraries/KDE
Requires: libkf5kdegames6 = %{version}
Requires: libKF5KDEGames%{sover} = %{version}
Requires: libsndfile-devel
Requires: openal-soft-devel
Requires: cmake(KF5Completion)
@ -125,6 +132,8 @@ BuildArch: noarch
%description -n kdegames-carddecks-default
This package contains the default card deck set for KDE games.
# Should be called libkdegames5-lang, but that requires replacing the
# macro with the expansion to Provide/Obsolete the old name.
%lang_package
%prep
@ -140,23 +149,31 @@ rm -r src/carddecks/svg-konqi-modern
%install
%kf5_makeinstall -C build
%if %{with lang}
%find_lang %{name} --with-man --all-name
%find_lang libkdegames5
%endif
%fdupes -s %{buildroot}
%fdupes %{buildroot}
%post -n libkf5kdegames6 -p /sbin/ldconfig
%postun -n libkf5kdegames6 -p /sbin/ldconfig
%post -n libKF5KDEGames%{sover} -p /sbin/ldconfig
%postun -n libKF5KDEGames%{sover} -p /sbin/ldconfig
%files
# Unversioned
%{_kf5_sharedir}/kconf_update/
%{_kf5_debugdir}/libkdegames.categories
%files -n libkf5kdegames6
%files -n libkdegames-qt5-imports
# Qt/KF-versioned
%license LICENSES/*
%{_kf5_qmldir}/
%files -n libKF5KDEGames%{sover}
# sover-versioned
%license LICENSES/*
%doc README
%{_kf5_debugdir}/libkdegames.categories
%{_kf5_libdir}/libKF5KDEGames.so.*
%{_kf5_libdir}/libKF5KDEGamesPrivate.so.*
%{_kf5_qmldir}/
%{_kf5_libdir}/libKF5KDEGames.so.%{sover}
%{_kf5_libdir}/libKF5KDEGames.so.%{sover}.*
%{_kf5_libdir}/libKF5KDEGamesPrivate.so.%{sover}
%{_kf5_libdir}/libKF5KDEGamesPrivate.so.%{sover}.*
%files devel
%{_kf5_cmakedir}/KF5KDEGames/
@ -176,7 +193,7 @@ rm -r src/carddecks/svg-konqi-modern
%{_kf5_sharedir}/carddecks/svg-oxygen-air
%if %{with lang}
%files lang -f %{name}.lang
%files lang -f libkdegames5.lang
%endif
%changelog