Luca Beltrame 2024-02-23 20:08:20 +00:00 committed by Git OBS Bridge
parent a9c3a952d1
commit 03fbafb427
7 changed files with 86 additions and 87 deletions

Binary file not shown.

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8RAACgkQu0YzUNbv
Me/rzA/+OV0jw8HO1OFP/IXwE7KJHwGtjymWcb/tE7dyRYY4t0I+A3TG86hrl69G
YxchfvjfWojUx/ILnz1/zIABdf7RvmyvXhda9dS0v8nxM8hymMlyzT9uLbNX13y6
Z8Q8ma8w5qn9+q9JXGy91nW4hQ0eKQuOVkDtMfy3nORccT9HOI+4UPpMxlL02JUi
Aelh+ZLoRDfFLvA482fsEMGwPbQ7iOF+OvSc0x+iWGBoxUbCaPmhDhs0tUJSTfHB
uO49uw3UXYVXWoRpC9tR0nF5hygVCMXeirz0PvrVbXor5N8+OmoZ22fEVjH8U2Er
CLomxaib4tri+OsvCWBqMm5OoWuTsNi5c8LlDRuklJuIwlF4IM4NmzaV7kHPLT4e
WcZMrQ+Oq21Ff9lYhCTQXiHjUQe/ud/aK1kyLQkJeZeteNp370HBDNYhAwiD/U+b
vZ0EoMPx4JPw3A/DyQVZba+1+tq8eSqCh9eb7oui6lenClJ4JVXN3fb8QR1Fyije
mP65oir5FXmbxz4VueiQbRMIRPgHTPn5OuHNKhBY9sn9/O+DM0Rszp9LkciZ+qFd
hxzMCdoWUblYB1G6l4dLRlwrZo4RnW8S+2oa+9ByOKzzbaWELlewuXBaJ2m7kNC4
eUSkVne96oS0xummC3nf35fB0Vkh4ZO+AyiVXvXQQMzTgXWxAEY=
=f6rX
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45DMACgkQOmpNuDnq
ptfG4g//XaHCb+6JM1e0clzTr/jWZ6R5u1LVd3Ifv5ZWEhFMMx+AUWt4tbelPI78
Nv0oaRQY/F0t91YhT9DeZE8bID/dZfES7X2WFJgXRy8VR2xVuxrdnPhdSp/WuYHV
TSIxtGggzWHIz4Xt0/ITQEr27XcMixSFjLdrKxctOvXz8b8e7JSt8gAF4JoEQ8x9
xBnNz1hjjphjmFM4GccICh7bO5vhOP6f3cyiXCr/b1XVtFuKCjohu5LrJCgJ4ZHv
FXUD+hsZCZgL7ulJ4TepxgDv7l8mW2RXlykHovrLBN5kdl4I6k0Ch26KZm6rqc4M
smn6MBtCWFWT/sNgm6SNtDnd/X3VsSxvM+Kvc0Af73kRK+3w7k4RsSKFv/oIO1Em
T614lFFdgdM/ilfe6z0FEUWmnyeGJWKH3NxLyZMgA3wX/yPtc5t79fG8m9J/+AFD
z3Ohs0S1Ar5RmT6BsRaEn7sAamMBZm0XXLkaQrcZXujbL+eUKP54m2JkRYz2zXwQ
PNrfb2uAaWF19Aw+MnmFpNzZ1bxLAVMPj7Vk0OrV/hzFi10fL0phHRQjqC2yYkRd
LMj5Chrqmu41nG+pZvesArk357rRwTAnon8k2fKU6q6I6EXS42FGTiz1B4Ekbvcm
wIFDhltL+diFZ/sDOdSWm+iDR6qP3dsq07bS10t883sZbQfLJ/c=
=zdpC
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,7 +1,7 @@
# #
# spec file for package kitinerary # spec file for package kitinerary
# #
# 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,113 +16,106 @@
# #
%define libname libKPimItinerary5 %define kf6_version 5.246.0
%define qt6_version 6.6.0
%define kpim6_version 5.240.95
%bcond_without released %bcond_without released
Name: kitinerary Name: kitinerary
Version: 23.08.4 Version: 24.01.95
Release: 0 Release: 0
Summary: Data model and extraction system for travel reservations Summary: Data model and extraction system for travel reservations
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
URL: https://www.kde.org URL: https://www.kde.org
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz Source: 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: extra-cmake-modules BuildRequires: doxygen
BuildRequires: kf5-filesystem BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
%if 0%{?suse_version} == 1500
BuildRequires: gcc10-c++
BuildRequires: gcc10-PIE
%endif
BuildRequires: libopenssl-devel
BuildRequires: libphonenumber-devel BuildRequires: libphonenumber-devel
BuildRequires: libpoppler-qt5-devel BuildRequires: pkgconfig
BuildRequires: libqt5-qtdeclarative-private-headers-devel BuildRequires: shared-mime-info
BuildRequires: libxml2-devel BuildRequires: cmake(KF6CalendarCore) >= %{kf6_version}
BuildRequires: zlib-devel BuildRequires: cmake(KF6Contacts) >= %{kf6_version}
BuildRequires: cmake(KF5CalendarCore) BuildRequires: cmake(KF6I18n) >= %{kf6_version}
BuildRequires: cmake(KF5Contacts) BuildRequires: cmake(KPim6Mime) >= %{kpim6_version}
BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KPim6PkPass) >= %{kpim6_version}
BuildRequires: cmake(KF5Mime) BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
BuildRequires: cmake(KPim5PkPass) BuildRequires: cmake(Qt6Qml) >= %{qt6_version}
BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt6ToolsTools) >= %{qt6_version}
BuildRequires: cmake(Qt5Qml)
BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(ZXing) BuildRequires: cmake(ZXing)
%requires_eq libKPim5Itinerary5 BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(poppler-qt6)
BuildRequires: pkgconfig(zlib)
Requires: libKPim6Itinerary6 = %{version}
Conflicts: libKPimItinerary5 < %{version} Conflicts: libKPimItinerary5 < %{version}
%description %description
Kitinerary is a library which provides a data model and a system to extract information Kitinerary is a library which provides a data model and a system to extract
from travel reservations. The model can then be reused in other applications. information from travel reservations. The model can then be reused in other
applications.
%package -n libKPim5Itinerary5 %package -n libKPim6Itinerary6
Summary: Data model and extraction system for travel reservations Summary: Data model and extraction system for travel reservations
%requires_eq %{name} Requires: kitinerary >= %{version}
# Renamed
Obsoletes: libKPimItinerary5-lang
%description -n libKPim5Itinerary5 %description -n libKPim6Itinerary6
Kitinerary is a library which provides a data model and a system to extract information Kitinerary is a library which provides a data model and a system to extract
from travel reservations. The model can then be reused in other applications. information from travel reservations. The model can then be reused in other
This package contains the library itself. applications.
This package contains the kitinerary library.
%package devel %package devel
Summary: Development files for kitinerary Summary: Development files for kitinerary
Requires: libKPim5Itinerary5 = %{version} Requires: libKPim6Itinerary6 = %{version}
Requires: libqt5-qtdeclarative-private-headers-devel Requires: cmake(KF6CalendarCore) >= %{kf6_version}
Requires: cmake(KF5CalendarCore) Requires: cmake(KF6Contacts) >= %{kf6_version}
Requires: cmake(KF5Contacts) Requires: cmake(KPim6Mime) >= %{kpim6_version}
Requires: cmake(KF5Mime) Requires: cmake(KPim6PkPass) >= %{kpim6_version}
Requires: cmake(KPim5PkPass) Requires: cmake(Qt6Gui) >= %{qt6_version}
Requires: cmake(Qt5Gui)
%description devel %description devel
This package contains all necessary include files and libraries needed This package contains all necessary include files and libraries needed
to build programs that use the kitinerary library. to build programs that use the kitinerary library.
%lang_package -n libKPim5Itinerary5 %lang_package -n libKPim6Itinerary6
%prep %prep
%autosetup -p1 %autosetup -p1
%build %build
%if 0%{?suse_version} == 1500
export CXX=g++-10
%endif
%cmake_kf5 -d build -- -DBUILD_TESTING=OFF %cmake_kf6 -DBUILD_QCH:BOOL=TRUE
%cmake_build
%kf6_build
%install %install
%kf5_makeinstall -C build %kf6_install
%find_lang %{name} --with-man --with-qt --all-name %find_lang %{name} --all-name
#%check %ldconfig_scriptlets -n libKPim6Itinerary6
#%ctest
%ldconfig_scriptlets -n libKPim5Itinerary5
%files %files
%license LICENSES/* %{_kf6_debugdir}/org_kde_kitinerary.categories
%{_kf5_debugdir}/*.categories %{_kf6_libexecdir}/kitinerary-extractor
%{_kf5_libexecdir}/kitinerary-extractor %{_kf6_sharedir}/mime/packages/application-vnd-kde-itinerary.xml
%{_kf5_sharedir}/mime/packages/application-vnd-kde-itinerary.xml
%files -n libKPim5Itinerary5 %files -n libKPim6Itinerary6
%{_kf5_libdir}/libKPim5Itinerary.so.* %license LICENSES/*
%{_kf6_libdir}/libKPim6Itinerary.so.*
%files devel %files devel
%dir %{_includedir}/KPim5/ %doc %{_kf6_qchdir}/KPim6Itinerary.*
%{_includedir}/KPim5/KItinerary/ %{_includedir}/KPim6/KItinerary/
%{_includedir}/KPim5/kitinerary/ %{_includedir}/KPim6/kitinerary/
%{_includedir}/KPim5/kitinerary_version.h %{_includedir}/KPim6/kitinerary_version.h
%{_kf5_cmakedir}/KPimItinerary/ %{_kf6_cmakedir}/KPim6Itinerary/
%{_kf5_cmakedir}/KPim5Itinerary/ %{_kf6_libdir}/libKPim6Itinerary.so
%{_kf5_libdir}/libKPim5Itinerary.so
%files -n libKPim5Itinerary5-lang -f %{name}.lang %files -n libKPim6Itinerary6-lang -f %{name}.lang
%changelog %changelog