Accepting request 1230316 from KDE:Extra

Update to 6.0.0

OBS-URL: https://build.opensuse.org/request/show/1230316
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kphotoalbum?expand=0&rev=19
This commit is contained in:
Ana Guerrero 2024-12-13 21:34:14 +00:00 committed by Git OBS Bridge
commit de5ee9dfe4
6 changed files with 62 additions and 60 deletions

View File

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

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQTyd2NrouQJNH1QNBHKpXsoD+Dp7gUCZwaEfAAKCRDKpXsoD+Dp
7gxJAQCdHv3T3/smpB53smlFJCZr68rG7Gbuzrf0Anjy2cKMSgD+LgdBOj+etJMB
zNRyLA3EqfzR+6+0LdV85CF8QIBMcAU=
=Oh83
-----END PGP SIGNATURE-----

3
kphotoalbum-6.0.0.tar.xz Normal file
View File

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

View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQTyd2NrouQJNH1QNBHKpXsoD+Dp7gUCZ1QiDwAKCRDKpXsoD+Dp
7gB0AP4vpZom6S4Z2BuwNKrVeGlfNFSdgpA41n7P1ityRzod8AD/f8rnAVkUNseP
2MxmoDd39eC0/aqxPsdQoLG8IApBBAc=
=Vgwp
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Dec 8 10:29:50 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.0.0
https://www.kphotoalbum.org/2024/12/07/kphotoalbum-6.0.0-released/
-------------------------------------------------------------------
Sat Nov 23 22:37:17 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@ -1,7 +1,7 @@
#
# spec file for package kphotoalbum
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,54 +16,49 @@
#
# Temporarily disabled until kphotoalbum gets a Qt6-based release
%bcond_with marble
#
%define kf6_version 6.0.0
%define qt6_version 6.6.0
%bcond_without released
Name: kphotoalbum
Version: 5.13.0
Version: 6.0.0
Release: 0
Summary: A photo administration utility
License: GPL-2.0-or-later
Group: Productivity/Graphics/Viewers
URL: https://www.kphotoalbum.org/
Source: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz.sig
Source2: kphotoalbum.keyring
%endif
BuildRequires: QtAV-devel
BuildRequires: cmake >= 3.18.0
BuildRequires: extra-cmake-modules > 5.92
BuildRequires: fdupes
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: libexiv2-devel
BuildRequires: libjpeg-devel
BuildRequires: cmake(KF5Archive)
BuildRequires: cmake(KF5Completion)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5CoreAddons) >= 5.78.0
BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5JobWidgets)
BuildRequires: cmake(KF5KDcraw)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Purpose)
BuildRequires: cmake(KF5TextWidgets)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5XmlGui)
%if %{with marble}
BuildRequires: cmake(Marble)
%endif
BuildRequires: cmake(Phonon4Qt5)
BuildRequires: cmake(Qt5Core) >= 5.15
BuildRequires: cmake(Qt5Sql)
BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5Xml)
BuildRequires: pkgconfig
BuildRequires: cmake(KDcrawQt6)
BuildRequires: cmake(KF6Archive) >= %{kf6_version}
BuildRequires: cmake(KF6Completion) >= %{kf6_version}
BuildRequires: cmake(KF6Config) >= %{kf6_version}
BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
BuildRequires: cmake(KF6DocTools) >= %{kf6_version}
BuildRequires: cmake(KF6I18n) >= %{kf6_version}
BuildRequires: cmake(KF6IconThemes) >= %{kf6_version}
BuildRequires: cmake(KF6JobWidgets) >= %{kf6_version}
BuildRequires: cmake(KF6KIO) >= %{kf6_version}
BuildRequires: cmake(KF6Purpose) >= %{kf6_version}
BuildRequires: cmake(KF6TextWidgets) >= %{kf6_version}
BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version}
BuildRequires: cmake(KF6XmlGui) >= %{kf6_version}
BuildRequires: cmake(Marble) >= 24.12.0
BuildRequires: cmake(Phonon4Qt6)
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
BuildRequires: cmake(Qt6Sql) >= %{qt6_version}
BuildRequires: cmake(Qt6Test) >= %{qt6_version}
BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
BuildRequires: cmake(Qt6Xml) >= %{qt6_version}
BuildRequires: pkgconfig(libvlc)
Requires: sqlite3
Requires: qt6-sql-sqlite >= %{qt6_version}
Recommends: marble
%description
@ -78,35 +73,36 @@ an image from a special place, or even both.
%autosetup -p1
%build
%cmake_kf5 -d build
%cmake_build
%cmake_kf6
%kf6_build
%install
%kf5_makeinstall -C build
%kf6_install
%find_lang %{name}
%{kf5_find_htmldocs}
%find_lang %{name} --with-html
# Fix rpmlint warning text file has executable bits
chmod 644 %{buildroot}%{_kf5_applicationsdir}/org.kde.kphotoalbum.open-raw.desktop
chmod 644 %{buildroot}%{_kf6_applicationsdir}/org.kde.kphotoalbum.open-raw.desktop
%fdupes %{buildroot}
%files
%license LICENSES/*
%doc CHANGELOG.md README.md
%{_kf5_applicationsdir}/*
%{_kf5_appstreamdir}/org.kde.kphotoalbum.appdata.xml
%{_kf5_bindir}/*
%{_kf5_configdir}/kphotoalbumrc
%{_kf5_htmldir}/en/kphotoalbum/
%{_kf5_iconsdir}/hicolor/*/*/*.png
%{_kf5_iconsdir}/hicolor/scalable/apps/kphotoalbum.svg
%{_kf5_libdir}/libkpabase.so
%{_kf5_libdir}/libkpaexif.so
%{_kf5_libdir}/libkpathumbnails.so
%{_kf5_sharedir}/kphotoalbum/
%{_kf6_applicationsdir}/*
%{_kf6_appstreamdir}/org.kde.kphotoalbum.appdata.xml
%{_kf6_bindir}/*
%{_kf6_configdir}/kphotoalbumrc
%{_kf6_htmldir}/en/kphotoalbum/
%{_kf6_iconsdir}/hicolor/*/*/*.png
%{_kf6_iconsdir}/hicolor/scalable/apps/kphotoalbum.svg
%{_kf6_libdir}/libkpabase.so
%{_kf6_libdir}/libkpaexif.so
%{_kf6_libdir}/libkpathumbnails.so
%{_kf6_sharedir}/kphotoalbum/
%files lang -f %{name}.lang
%exclude %{_kf6_htmldir}/en/kphotoalbum/
%changelog