Accepting request 1189497 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/1189497 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=222
2024-07-25 13:39:42 +00:00 · 2024-07-25 13:39:42 +00:00 · e91869219e
commit e91869219e
parent d5b511550f
7 changed files with 49 additions and 41 deletions
--- a/0001-Look-for-each-akonadi-component-separately.patch
+++ b/0001-Look-for-each-akonadi-component-separately.patch
@ -7,25 +7,26 @@ Subject: [PATCH] Look for each akonadi component separately
 core/cmake/rules/RulesKDEFramework.cmake | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

-Index: digikam-8.3.0/core/cmake/rules/RulesKDEFramework.cmake
+Index: digikam-8.4.0/core/cmake/rules/RulesKDEFramework.cmake
 ===================================================================
--- digikam-8.3.0.orig/core/cmake/rules/RulesKDEFramework.cmake
-+++ digikam-8.3.0/core/cmake/rules/RulesKDEFramework.cmake
-@@ -37,14 +37,9 @@ endif()
+--- digikam-8.4.0.orig/core/cmake/rules/RulesKDEFramework.cmake
+++ digikam-8.4.0/core/cmake/rules/RulesKDEFramework.cmake
+@@ -51,15 +51,9 @@ if(ENABLE_AKONADICONTACTSUPPORT)
+         find_package(KPim${QT_VERSION_MAJOR}AkonadiContactCore ${AKONADI_MIN_VERSION} QUIET)
 
- if(ENABLE_AKONADICONTACTSUPPORT)
+     else()
+-
+-        find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
+-                                                OPTIONAL_COMPONENTS
+-                                                Akonadi
+-                                                AkonadiContact      # For KDE Mail Contacts support.
+-                                                Contacts            # API for contacts/address book data.
+-        )
+-        find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
+-        find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET)
+        find_package(KF${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
+        find_package(KF${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
+        find_package(KF${QT_VERSION_MAJOR}Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data.
 
-    find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
-                                            OPTIONAL_COMPONENTS
-                                            Akonadi
-                                            AkonadiContact      # For KDE Mail Contacts support.
-                                            Contacts            # API for contacts/address book data.
-    )
-    find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
-    find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET)
-+    find_package(KF${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
-+    find_package(KF${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
-+    find_package(KF${QT_VERSION_MAJOR}Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data.
- 
- endif()
+     endif()
 
--- a/digiKam-8.3.0-1.tar.xz
+++ b/digiKam-8.3.0-1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05b145ff7f2f2005fa21bc579c152ab23c8191b678ff2944c8f0406d6b9de6d8
-size 55664168
--- a/digiKam-8.3.0-1.tar.xz.sig
+++ b/digiKam-8.3.0-1.tar.xz.sig
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmX1RDwACgkQSnd0e8I4
-blAWfQ//WaksowRWfMgNA6IymcepGIceyau11MRRiJHZpnXc+8DbHOg5gZ1sf4e+
-3ySV5UTKQl3HhJmX1yBUWQECGv0wA/PH4ok/8ic1oFFsNWoL0nIxo2PWFyIC7Pdl
-X+zKRLMeedOHE0ifzoc245j5L18ejimPDPivBBNHlNbAa+F+ToFQOG3F0eMYvb9Q
-F9yGrrSgr9ZkmfruPGvHMG0NAPDdLrj8BdBA5YjCuTzafvV9Kx4VdNaNVk0Pyc+x
-D38t5x+XgNRJ4n9pb3PAb+z1FlMyJUBGwDvYp9us7K0ECLlft8QoVZIwDBpEM1+3
-cn4/tzpf8FzIkirSCJjuOF+ak4LaxVFOksMNiAAwl0lYbt8k/lQFVTyXd9BjkBXO
-ho6HQdiHlyjO5OAFekqsH+4AoSNohrcsd9r70YEjqTNvgWD5tP74Pr5kDRlPMH5T
-cx/94YOU5911LNSrkcYQRlg94IUH8/rXNy39vCgs+mEaKRBxu3e18U9vDGG9S0go
-4R4yzcwVgzzOFhSPtGdJ5VoO2hJ6aYGCOHvlw3jMG3F8ZewAq0yk3IYxI4hnbbNf
-CYxoth/dlwA/LucubZH97bfQY4ilM7lH9eqJdqpvxRG7tzljpnd/zRbX3mvM+jpo
-9LqtattWstG7+SpyvzUEpDtXqQ5s/tqtTz6yg6Vgv0PzcQcII6M=
-=VGKT
-----END PGP SIGNATURE-----
--- a/digiKam-8.4.0.tar.xz
+++ b/digiKam-8.4.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53c8aca5a2f660173e29a860d8b13844bd0ec748ef3f618c42f7689476494481
+size 58025616
--- a/digiKam-8.4.0.tar.xz.sig
+++ b/digiKam-8.4.0.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmaRkEgACgkQSnd0e8I4
+blD6dBAAp6RaMFzrZqIAhqD89/YRcNda/z3WQuUAkQOkheD7EdP6iLHZ37JJ3LYo
+KLtgmM3q3LstaArDKjyXV1LqFXyqDdKvaGLHhix9dANrpyh9Z8xL3GAoxoPk04bO
+d9qNqoi8vfguxHmHoloQd3CPTZXgox4ex/NCfqjAEMfBzL8dC0kR9y+azh3o3ybN
+QnAzcTGD5QXF4dt802vMgvfEMFfX04uAM9spHNWe7mE/4+evfcPv++X+vsd/rTI8
+/gykvqfsY3ah58jbNdVdWdvc6DJggAhCt2AnTieCSVOn/NByK3Z39ep/WqRemzj/
+ijhWO+5TcAkIc73/KWFFLdNDrshOPUmErxLTdgQd3dXlcEmkJasJnMvVKRwiU8Dz
+vJ//9eJPsHeQ9/33+Rcb4EE3f/RoJH2/usDNjMID1x6CkqcTxaz4u0jeDiYv9f5+
+CeH1k7b3aDcAStXozrdiQa5hRwmjjScEiHvTz5SLPcvItXKUOm39a5JfJPQVQjbh
+PwdL4JfskjRQfu4BV9uvyFIeK2cVOzm5BJYTIjZV/YEa8wyFuc4UHelizoIoMJl2
+tjE6zxiZboLkISlp6CFyypn6lGdf3CrB1FE25/SBaBUgzovlyyHVdQqWRvSka7Zq
+z0pgX9ja5ZAcYnXAanADDHsXe1rQPS1rHq1XerHQQSto4q1gfho=
+=fF/7
+-----END PGP SIGNATURE-----
--- a/digikam.changes
+++ b/digikam.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul 24 19:19:47 UTC 2024 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
+
+- Update to 8.4.0:
+  https://www.digikam.org/news/2024-07-14-8.4.0_release_announcement/
+- Rebase 0001-Look-for-each-akonadi-component-separately.patch
+
 -------------------------------------------------------------------
 Tue Apr  2 21:52:10 UTC 2024 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>

--- a/digikam.spec
+++ b/digikam.spec
@ -16,18 +16,18 @@
 #


-%define soversion 8_3_0
+%define soversion 8_4_0
 %bcond_without released
 %bcond_with    apidocs
 Name:           digikam
-Version:        8.3.0
+Version:        8.4.0
 Release:        0
 Summary:        A KDE Photo Manager
 License:        GPL-2.0-or-later
 URL:            https://www.digikam.org/
-Source0:        https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}-1.tar.xz
+Source0:        https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz
 %if %{with released}
-Source1:        https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}-1.tar.xz.sig
+Source1:        https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz.sig
 Source2:        %{name}.keyring
 %endif
 # PATCH-FIX-OPENSUSE