Luca Beltrame 2024-02-23 20:08:35 +00:00 committed by Git OBS Bridge
parent 5b8e66f438
commit f21c8ebe1d
7 changed files with 75 additions and 58 deletions

Binary file not shown.

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8UsACgkQu0YzUNbv
Me8YFg/9FyvmigTb+5ZkVfrqn277sa1YhHW4n+fCcNwwHcHa0PgVCA2vaz+LgVLH
D8oK/sihe5qYRKIxjqepBiQE2cKvTW1CvYYWt9foIwdBhTmL98RD1g39bjYrYBYI
MYoINU6vKPDh0NH5JEgpWsfnRHb6j5FXge3BtC518OF9UC1u7WclNfMV3Xpojn3d
bTXWGg6D/h3gRuFLRz+7jJb07EKDEYJUkKw6l9XW7AmKUr6y6Zs87cBBygI5woXu
VvRfRWPbrRFeo5zycYwXSK0HlCwrBNFeTO1Zh5Wk4l0QiFmtIU1nM3r6CS9NNHNQ
D/9ysTUCrGVlkrofB+60ymLkrSd6eKHr04vxBum1vyOvuWuHkf3WcdR70gnlOKWJ
3ut+eTaKkS/FQswvJxcGOWjB7bMBUjEVmJ46Hnj+lQL4vQqIUV1ERmJYMVaeHawl
C3QwboIvEmVTHOo92/qiv0U7ejTT0kIO90ayo0bwLoA88dImDjAPmkwN7TvxggIT
XfC2MT64jfEq6q0lixEpZYiPeO4ZZXmZZTGoS9N+c/5UF6iBhmEd9+2fl54wIG0Q
hWUwmTnfGOpA/zDbdZnkJ2KNU57v4Et4y/Ycq9+0OiUJzAR7XhIJCkLmcAszfGH6
0KwDIxE8X1poopn+QuxOgInZ8Gvj5nawkd2zuE/xumoHyQpDL8M=
=GIGh
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45HMACgkQOmpNuDnq
ptfzGQ/9EyIn8jGHnFza+IHBJtEYasSsa2MbcPjVIY91lZF4N7l6XzRm08oYcwz6
KzADkedkgPDf8TsMyoK+KvSfEYxTr2XZsFeA5vizzPoG8v35IHC40ZAnZuC7C+c0
g6yJtRYVFcidP0T4dKinVpKXf8PymzMwBwMLbajJvFFJTKLIGP9SqgrJUDVHIFdi
bpt1zEkDDnxHlG3TpjolSc6Yf/lw9Mpz/KwJKNctzs6Sn0IETqcBtlO08R5au/62
HXlWbu87CWd7OWPd9xSyNJnDjg3rcuuHJ4k6RL230OTO2Pw2V4ujopTnZzkSRG33
gpci2mHeD9CO/sAwdJaI2GFiHPqdrHPOXSPe5J4Lh+764zAkFramxNggdqPkOyt3
Iff7IoF/1OdxlxO1c/wTldmf3e7d/Pw2PuvgEVYGCjEPkXG/6O7n7pVxVPJS4xIP
OcE0b0+Yn78cV+lLsjoAyPhZBloDOC4jXR3mv4vwUZINWGBpWASVH9Lage3UW7l4
eIFmh92nKc7gX0/rXb+e9sKkxU9lsUBQPlR+Y3x+A5+h0oAH6GAIolrfNYyUx+HU
4qKMRo5uMDWfueMpZexGfT3sxX/iT0zdXq2yWiT1vN2JZzy54qa0wJylKRnwrrjH
Gx6qLfaQnqUUkDjlECWCGc5BsbbwhQXXdHwrtVhhFYvZf9PWndY=
=IGtf
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 9 16:09:10 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.01.95
* https://kde.org/announcements/megarelease/6/rc2/
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 5 14:20:04 UTC 2023 - Christophe Marin <christophe@krop.fr> Tue Dec 5 14:20:04 UTC 2023 - Christophe Marin <christophe@krop.fr>

View File

@ -1,7 +1,7 @@
# #
# spec file for package kosmindoormap # spec file for package kosmindoormap
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,55 +16,65 @@
# #
%define soversion 1 %define kf6_version 5.246.0
%define qt6_version 6.6.0
%bcond_without released %bcond_without released
Name: kosmindoormap Name: kosmindoormap
Version: 23.08.4 Version: 24.01.95
Release: 0 Release: 0
Summary: OSM indoor map QML component Summary: OSM multi-floor indoor map renderer
License: LGPL-2.0-or-later AND CC0-1.0 License: LGPL-2.0-or-later AND CC0-1.0
URL: https://apps.kde.org/kosmindoormap URL: https://apps.kde.org/kosmindoormap
Source0: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz Source0: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
%if %{with released} %if %{with released}
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring Source2: applications.keyring
%endif %endif
BuildRequires: bison BuildRequires: bison
BuildRequires: extra-cmake-modules BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: flex BuildRequires: flex
BuildRequires: libQt5Core-private-headers-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: cmake(KF5I18n) BuildRequires: qt6-base-private-devel >= %{qt6_version}
BuildRequires: cmake(KF6I18n) >= %{kf6_version}
BuildRequires: cmake(KOpeningHours) BuildRequires: cmake(KOpeningHours)
BuildRequires: cmake(KPublicTransport) BuildRequires: cmake(KPublicTransport)
BuildRequires: cmake(Qt5Quick) BuildRequires: cmake(Qt6Quick) >= %{qt6_version}
BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
BuildRequires: cmake(Qt6Test) >= %{qt6_version}
BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
Requires: libKOSM%{soversion} = %{version}
%description %description
QML components for KDE Itinerary. OSM multi-floor indoor map renderer.
%package -n libKOSM%{soversion} %package imports
Summary: QML imports for kosmindoormap
Requires: libKOSM1 = %{version}
%description imports
QML components for KOpeningHours.
%package -n libKOSM1
Summary: OSM primitives for kosmindoormap Summary: OSM primitives for kosmindoormap
Requires: kosmindoormap >= %{version}
%description -n libKOSM%{soversion} %description -n libKOSM1
OSM primitives for kosmindoormap. OSM primitives for kosmindoormap.
%package -n libKOSMIndoorMap%{soversion} %package -n libKOSMIndoorMap1
Summary: OSM multi-floor indoor map renderer Summary: OSM multi-floor indoor map renderer
%description -n libKOSMIndoorMap%{soversion} %description -n libKOSMIndoorMap1
OSM multi-floor indoor map renderer library. OSM multi-floor indoor map renderer library.
%package devel %package devel
Summary: Development package for kosmindoormap Summary: Development package for kosmindoormap
Requires: libKOSM%{soversion} = %{version} Requires: libKOSM1 = %{version}
Requires: libKOSMIndoorMap%{soversion} = %{version} Requires: libKOSMIndoorMap1 = %{version}
%description devel %description devel
This package contains development files for the KOSM and KOSMIndoorMap libraries. Development files for the KOSM and KOSMIndoorMap libraries.
%lang_package %lang_package
@ -72,14 +82,12 @@ This package contains development files for the KOSM and KOSMIndoorMap libraries
%autosetup -p1 %autosetup -p1
%build %build
%cmake_kf5 -d build -- -DBUILD_TESTING=ON %cmake_kf6 -DBUILD_TESTING=ON
%cmake_build %kf6_build
%install %install
%kf5_makeinstall -C build %kf6_install
%find_lang %{name}
%check %check
# Two tests fail on i586 (one minor floating point issue and a color one). # Two tests fail on i586 (one minor floating point issue and a color one).
@ -88,22 +96,25 @@ This package contains development files for the KOSM and KOSMIndoorMap libraries
%ctest %ctest
%endif %endif
%ldconfig_scriptlets -n libKOSM%{soversion} %find_lang %{name}
%ldconfig_scriptlets -n libKOSMIndoorMap%{soversion}
%ldconfig_scriptlets -n libKOSM1
%ldconfig_scriptlets -n libKOSMIndoorMap1
%files %files
%{_kf6_debugdir}/org_kde_kosmindoormap.categories
%files imports
%{_kf6_qmldir}/org/kde/kosmindoormap/
%{_kf6_qmldir}/org/kde/osm/
%files -n libKOSM1
%license LICENSES/* %license LICENSES/*
%doc README.md %doc README.md
%dir %{_kf5_qmldir}/org %{_kf6_libdir}/libKOSM.so.*
%dir %{_kf5_qmldir}/org/kde
%{_kf5_debugdir}/org_kde_kosmindoormap.categories
%{_kf5_qmldir}/org/kde/kosmindoormap/
%files -n libKOSM%{soversion} %files -n libKOSMIndoorMap1
%{_kf5_libdir}/libKOSM.so.* %{_kf6_libdir}/libKOSMIndoorMap.so.*
%files -n libKOSMIndoorMap%{soversion}
%{_kf5_libdir}/libKOSMIndoorMap.so.*
%files devel %files devel
%{_includedir}/KOSM/ %{_includedir}/KOSM/
@ -111,9 +122,9 @@ This package contains development files for the KOSM and KOSMIndoorMap libraries
%{_includedir}/kosm/ %{_includedir}/kosm/
%{_includedir}/kosmindoormap/ %{_includedir}/kosmindoormap/
%{_includedir}/kosmindoormap_version.h %{_includedir}/kosmindoormap_version.h
%{_kf5_cmakedir}/KOSMIndoorMap/ %{_kf6_cmakedir}/KOSMIndoorMap/
%{_kf5_libdir}/libKOSM.so %{_kf6_libdir}/libKOSM.so
%{_kf5_libdir}/libKOSMIndoorMap.so %{_kf6_libdir}/libKOSMIndoorMap.so
%files lang -f %{name}.lang %files lang -f %{name}.lang