From 39e5199663f46c762ce2260a0c93cc94b817e109aebbe7012ee8b024aa550e55 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 16 Jun 2024 08:35:35 +0000 Subject: [PATCH] Plasma 6.1 maybe final, somewhat tested. KDE:Frameworks already publish disabled. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/pam_kwallet6?expand=0&rev=17 --- ...specifing-KWALLETD_BIN_PATH-manually.patch | 32 ------------------- ...nstallDirs-instead-of-KDEInstallDirs.patch | 19 +++++------ kwallet-pam-6.0.5.tar.xz | 3 -- kwallet-pam-6.0.5.tar.xz.sig | 16 ---------- kwallet-pam-6.1.0.tar.xz | 3 ++ kwallet-pam-6.1.0.tar.xz.sig | 16 ++++++++++ pam_kwallet6.changes | 24 ++++++++++++++ pam_kwallet6.spec | 9 +++--- 8 files changed, 55 insertions(+), 67 deletions(-) delete mode 100644 0001-Allow-specifing-KWALLETD_BIN_PATH-manually.patch delete mode 100644 kwallet-pam-6.0.5.tar.xz delete mode 100644 kwallet-pam-6.0.5.tar.xz.sig create mode 100644 kwallet-pam-6.1.0.tar.xz create mode 100644 kwallet-pam-6.1.0.tar.xz.sig diff --git a/0001-Allow-specifing-KWALLETD_BIN_PATH-manually.patch b/0001-Allow-specifing-KWALLETD_BIN_PATH-manually.patch deleted file mode 100644 index 7709642..0000000 --- a/0001-Allow-specifing-KWALLETD_BIN_PATH-manually.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9be236e39ef3ac75772066ecc60cab2ca6f54e5c Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Thu, 14 Mar 2024 19:29:48 +0100 -Subject: [PATCH 1/2] Allow specifing KWALLETD_BIN_PATH manually - -That way the dependency on KF6::Wallet can be avoided. ---- - CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f10b4f..643270e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -43,9 +43,12 @@ set(pam_kwallet_SRCS - pam_kwallet.c - ) - --find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS -+if (NOT KWALLETD_BIN_PATH) -+ message (STATUS "KWALLETD_BIN_PATH not set, trying KF6::Wallet") -+ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS - Wallet --) -+ ) -+endif () - - add_definitions(-DKWALLETD_BIN_PATH="${KWALLETD_BIN_PATH}") - --- -2.43.0 - diff --git a/0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch b/0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch index def0bad..bda4ed0 100644 --- a/0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch +++ b/0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch @@ -8,11 +8,11 @@ This installs rather generic files so it's not necessary to query Qt here. CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 643270e..e94130b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,7 +12,7 @@ find_package (ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) +Index: kwallet-pam-%{_plasma6_version}git.20240421T181146~fa8c240/CMakeLists.txt +=================================================================== +--- kwallet-pam-%{_plasma6_version}git.20240421T181146~fa8c240.orig/CMakeLists.txt ++++ kwallet-pam-%{_plasma6_version}git.20240421T181146~fa8c240/CMakeLists.txt +@@ -12,7 +12,7 @@ find_package (ECM ${KF6_MIN_VERSION} REQ set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ) include(CheckFunctionExists) @@ -20,10 +20,10 @@ index 643270e..e94130b 100644 +include(GNUInstallDirs) include(KDEClangFormat) include(ECMConfiguredInstall) + include(KDEGitCommitHooks) +@@ -93,13 +93,11 @@ kde_clang_format(${ALL_CLANG_FORMAT_SOUR -@@ -90,13 +90,11 @@ target_link_libraries (${library_name} - file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) - kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) + kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) -install(TARGETS ${library_name} DESTINATION ${KDE_INSTALL_LIBDIR}/security) +install(TARGETS ${library_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/security) @@ -39,6 +39,3 @@ index 643270e..e94130b 100644 ecm_install_configured_files(INPUT plasma-kwallet-pam.service.in @ONLY DESTINATION - ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) + ${CMAKE_INSTALL_PREFIX}/lib/systemd/user/) --- -2.43.0 - diff --git a/kwallet-pam-6.0.5.tar.xz b/kwallet-pam-6.0.5.tar.xz deleted file mode 100644 index 19f066b..0000000 --- a/kwallet-pam-6.0.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25c61128eaefb563e500547f650be293e75126ed5fc2fac574ef40cccbfd00db -size 22932 diff --git a/kwallet-pam-6.0.5.tar.xz.sig b/kwallet-pam-6.0.5.tar.xz.sig deleted file mode 100644 index f4f107b..0000000 --- a/kwallet-pam-6.0.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmZM0GEACgkQ11dEg7tX -sY0M+g/+LEPV7bSqwOns+oVOjLyKB7ZDLT0NSjC4fPX3Itx2AgsWMRtpqSqCw6Br -WarmWhLoWKpn/jaak+7ZyN9j5xfq5wrjpycpzXq3/hhOQ0Fm4f1T3QoEdSVY7cGW -I6GSvaQRfzMzKTLmMwfRiJOxTjlJT887K5RwVRsWZ8TtTO1hgTb7cxGDqrxduVYi -Hsr+cBHZ00XHMwIVjUj4DFnasZvRDQaPhTgJyAxF3hZE7y+Meu9BFJYWkHA9IyDZ -iJAbsXMBodLC5DvTe0gbvmvXfv6tqJzdNVSOoCuACtAsxXti9d7s2b4NGVsCMmkw -ET2zIoOWHHRjJWYDP6S3wDHXSA+rgohsyTVnO2b4KDQv3Cii2SklmUS64c7CYMXa -AN314vIez69ovpsctd+sjEdh20E3L6WO6mpCUPAYqfLE2S4YqcZF9trxp92P4Het -+deQyAmQOxhZtDgG+nxBe1UPbUmyHr/XaDiso4bqYeHL4PZGfYgVcs1mY0KCoFBW -7bOsMB4S8nl7OMKBaHlUrOg4q06kQq7Tr7kJPJ+6sox0B9UPuys8rjOLUeZjr5xV -xp1JxNk8wgfQQjvcWdmRcpdNjQyadwA8i35gmPEsQbkFGkvek9W4MiM35NRM//z3 -sFnp2kR1bkAu1+36sYYpohj8aQVehT68GvQHJzfMQVNqHTgA0/s= -=ZBED ------END PGP SIGNATURE----- diff --git a/kwallet-pam-6.1.0.tar.xz b/kwallet-pam-6.1.0.tar.xz new file mode 100644 index 0000000..efa9705 --- /dev/null +++ b/kwallet-pam-6.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b21ed862e9751dfea938e557185ac8eaa24ae260ef795fb99ad74d3c4cb96a1a +size 23064 diff --git a/kwallet-pam-6.1.0.tar.xz.sig b/kwallet-pam-6.1.0.tar.xz.sig new file mode 100644 index 0000000..fdc3283 --- /dev/null +++ b/kwallet-pam-6.1.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmZqy20ACgkQ11dEg7tX +sY3E8xAAt0QPkjnU42sM3bnlXbhhgZKCULlOZMbESqxYUr77Orq5x8TaNvwozMm4 +kvOki4BFc6oa2QQEsXDV2Mx8u5Xh1C0yfydP//Ay8eJL35rqrTERrU+o+tpKgcqV +B40t1CnBG4xYyyQTzwsWOWjMWErOuA/boPCIv1DsmR2FlEm9hk/zuehTD1ol1rbl +SkF9BPqZzIgfl9+khQezze0K6mOJZ3R0iNImKGXRp9C9mrCRcSgKr22eEPOfes+u +26pti61c4siDRMXsmYQ2v9TYJ9ncL5LJY9yTBfd6YP95nICD9UddeKwnqhnVx0s/ +Hsh0CDlQpiRsLpq0DQGGB4gGAuLLutssBQytLIEJqiI906Dx9xfGPngGa3YeRM92 +/heGH9DZIjsE8SBhBxnCNY81qtas6Lr56HLnVGZaPwXWNT6tpBxFFfDlO4r6NCVd +Xbz66Dcyxaa2I1JHFcXTHuI21cfBahwhV04dSzj847Pdd/R4Tdj7mrcUFRuwh++s +7ILedaBrz3w9XnoueyKhqJQBDUUaWwIlpLMjkGprBwxncvEszoQzMrjfHka7881O +rluXtY3b8KBDePnDODsBJcjtfXHCk5zHSLIgZ0ihFu76qxgB4sUiH1kLo5GJIEGi +5kgZPtlksZwPyxy5G60buuNwvJdb+Zjh9LNaXAJXx4dUk8gsKo4= +=hggG +-----END PGP SIGNATURE----- diff --git a/pam_kwallet6.changes b/pam_kwallet6.changes index 17310d1..6b2d9f0 100644 --- a/pam_kwallet6.changes +++ b/pam_kwallet6.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Jun 13 10:58:39 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 + +------------------------------------------------------------------- +Sat May 25 11:18:58 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 +- Changes since 6.0.5: + * update version for new release + * Add clang-format commit hook + * Move cmake_minimum_required above project + * Allow specifing KWALLETD_BIN_PATH manually +- Drop patches, now upstream: + * 0001-Allow-specifing-KWALLETD_BIN_PATH-manually.patch +- Refresh 0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch + ------------------------------------------------------------------- Wed May 22 07:43:10 UTC 2024 - Fabian Vogt diff --git a/pam_kwallet6.spec b/pam_kwallet6.spec index e8802ed..f00716f 100644 --- a/pam_kwallet6.spec +++ b/pam_kwallet6.spec @@ -23,20 +23,19 @@ %bcond_without released Name: pam_kwallet6 -Version: 6.0.5 +Version: 6.1.0 Release: 0 Summary: A PAM Module for KWallet signing License: GPL-2.0-or-later AND LGPL-2.1-only AND GPL-3.0-only 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 Source3: baselibs.conf # PATCH-FEATURE-OPENSUSE -Patch1: 0001-Allow-specifing-KWALLETD_BIN_PATH-manually.patch -Patch2: 0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch +Patch0: 0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: pam-devel BuildRequires: pkgconfig