diff --git a/0001-Revert-Require-CUPS-version-2.4.x.patch b/0001-Revert-Require-CUPS-version-2.4.x.patch new file mode 100644 index 0000000..98af96d --- /dev/null +++ b/0001-Revert-Require-CUPS-version-2.4.x.patch @@ -0,0 +1,26 @@ +From bc964a7e9f2fed1c63e5d56d4a9050afbfb556ce Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Sat, 25 May 2024 21:07:15 +0200 +Subject: [PATCH] Revert "Require CUPS version 2.4.x" + +This reverts commit 5e090189c55f1180d4d2dc3be346ec081b0e14bc. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e210ad22..63901858 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,7 +64,7 @@ set_package_properties(PackageKitQt6 + PURPOSE "Needed to automatically install the system-config-printer package." + ) + +-find_package(Cups "2.4" REQUIRED) ++find_package(Cups "1.5" REQUIRED) + + find_package(CupsSmb) + set_package_properties(CupsSmb PROPERTIES +-- +2.44.0 + diff --git a/plasma6-print-manager.changes b/plasma6-print-manager.changes index 6bedf5c..4e05d42 100644 --- a/plasma6-print-manager.changes +++ b/plasma6-print-manager.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Jun 13 10:58:48 UTC 2024 - Fabian Vogt + +- Update to 6.1.0: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.0 +- Changes since 6.0.90: + * update version for new release + * appstream versions + * update version for new release + * kcm/qml: Fix return value for JS url + * kcm/[core/qml]: Fix manual PPD file add/change + +------------------------------------------------------------------- +Sat May 25 11:19:30 UTC 2024 - Fabian Vogt + +- Update to 6.0.90: + * New feature release + * For more details see https://kde.org/announcements/plasma/6/6.0.90 +- Too many changes to list here +- Add patch to fix build with older CUPS, the newer version isn't + actually needed yet: + * 0001-Revert-Require-CUPS-version-2.4.x.patch + ------------------------------------------------------------------- Wed May 22 07:43:16 UTC 2024 - Fabian Vogt diff --git a/plasma6-print-manager.spec b/plasma6-print-manager.spec index 007b10c..37f7904 100644 --- a/plasma6-print-manager.spec +++ b/plasma6-print-manager.spec @@ -27,18 +27,21 @@ %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without released Name: plasma6-print-manager -Version: 6.0.5 +Version: 6.1.0 Release: 0 Summary: Tools for managing print jobs and printers License: GPL-2.0-or-later URL: https://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz +Source: %{rname}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig +Source1: %{rname}-%{version}.tar.xz.sig Source2: plasma.keyring %endif -BuildRequires: cups-devel +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Require-CUPS-version-2.4.x.patch +BuildRequires: cups-devel >= 1.5 BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: system-config-printer-dbus-service BuildRequires: cmake(KF6Config) >= %{kf6_version} BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version} BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} @@ -62,6 +65,7 @@ BuildRequires: cmake(Qt6Quick) >= %{qt6_version} BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} Requires: kf6-kirigami-imports >= %{kf6_version} Requires: kirigami-addons6 >= 0.10 +Requires: system-config-printer-dbus-service Recommends: samba-client Obsoletes: print-manager5 < %{version} Provides: print-manager5 = %{version} diff --git a/print-manager-6.0.5.tar.xz b/print-manager-6.0.5.tar.xz deleted file mode 100644 index e1fc852..0000000 --- a/print-manager-6.0.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57ac21ff34da2c8c66f47878de2c04d2ea05395f2977fc96c51deeb04733a337 -size 339988 diff --git a/print-manager-6.0.5.tar.xz.sig b/print-manager-6.0.5.tar.xz.sig deleted file mode 100644 index 200164d..0000000 --- a/print-manager-6.0.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmZM0QcACgkQ11dEg7tX -sY0URA/+Mf5uvctVFYJo6K+jV3Mq6h3/bdBZiZxMZBX1wPg4ODlhQSMpyk4NJQiw -b2HHH1pUxUS9W+Uh4X6MtHs+dW+5TXIorWNtHNs+QRSBi1xTBStcH03ObFSEVwZk -ZarF5+ZQIvCGMBP4ROh5qmSpFgWC0RoitgNTI3NrRuw/FVmp7ym3CqgL5d6IHYTC -qN7nBwHbfrwHLGfYEgCuYuvlI+Sya1JYLzforEmHLhiZdoXoWqGB6ZzaT0UrIxYw -Rn7KYBDBEviVe/QxLv1j7CG+uKNCTd4mBP4QM4GHRuXWWj9XiCC7NjLM8zmPMIPn -OUT+D9PdGJ5VYpFo/oqSBLgjEjcJznbkjLrynWOUfj6nSLyfqDcufXhVsvcELNGT -Nn9FrHHnm6F6vKzBsFrG0KkU21gStATYjgQe2t6Gfd121KWqPKWMtyz0lXlROT+Z -S4Lq6BcS05Tl+X4GG7D1FSzfWKGjSKukt1KpTBUpKr1EREEyN14HixMTbsIed0ao -Muug19ubY8wxJgHZ5XvmFN3e4c1oCF5rnUhuYD8lAICuQ/7GKvVH15Ppi8JlASiY -XgkubaRzgUjGj57oiNnKoXwjcBLBPowh/Df1Q0ots1jDJOVOp1WOm7HrzpcZWmmg -AXnA7Wd35CJyQ5WyD/XHcrajGSumR9IUsKu7sKpEKysXU22BjZ4= -=VgF8 ------END PGP SIGNATURE----- diff --git a/print-manager-6.1.0.tar.xz b/print-manager-6.1.0.tar.xz new file mode 100644 index 0000000..09568dd --- /dev/null +++ b/print-manager-6.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c63c74054864087750409029ee4881bc1165ab93ce601669edcbf38cc2f20215 +size 367816 diff --git a/print-manager-6.1.0.tar.xz.sig b/print-manager-6.1.0.tar.xz.sig new file mode 100644 index 0000000..9abebd6 --- /dev/null +++ b/print-manager-6.1.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmZqzA0ACgkQ11dEg7tX +sY2BWRAAnUANvUn/bzbfJgVDNMeY4LavZoSFnqBxIAM3DrfvJgATarpXF9bUAHvM +//DW3XZQBTHsYHYvVDqf7vML+x+j4xnH/uY9AAICb/YZOcBBLJ1z8ZcH4HylQfhF +txObD8TIPVycOZCrDQBfl2gu0O/XHH2sMlKYXYCty1vpxM8MOG7OSarAKasMUodq +4P4t8wgnn5kd4x04W6YAoCl7T+PglsL+/7Hj4HNb6rGWvA4BbyUtvF5JBBHRVkoe +m4JFZSC70oeeJwnCv2iJyeDOmYHkDXRy/DSRDPZYwQMXcgBGzT7a51cBJGkwZUoP +oL0ApJziowGKZviQIB9jLDnimNDQbPgZo/Lz7psVxxXSc2PThxOJkEZIPwhmqOUg +gs5oCBqf/30t3OPApeoVDPh2KgyfR/h3mpaZGPLpMJxAkPNNuHX438lVsFxPpu7r ++D8EWwCB14/NpdRGp4+XBHv94409O2tGJZd6e4zhSAoGk/qvWA7AcTkqRKJu2yTV +lFOV4TtFYKjxzQdafRTCjuXCevHGSDKIOPA5IACPupksKnGKtlWfa9Tgeq1prUbR ++4Sbym4KDvz9lN2Vj98sFlGjZgr/gEof3zNuLWSotO6oMYVp1k+lQt5TRJucXQXf +qdxrbLc3zgReh+AFMUO1RDA1TjGD7U/HoUiJkFhAesDESmu7sXU= +=7ief +-----END PGP SIGNATURE-----