From db7554a29d9579a00f2e37402533882e44bcebe4 Mon Sep 17 00:00:00 2001 From: Zoltan Fridrich Date: Wed, 29 Nov 2023 11:32:02 +0100 Subject: [PATCH] Update spec file Related: RHEL-10571 Signed-off-by: Zoltan Fridrich --- .gitignore | 1 + ...kit-dt-needed.patch => 001-dt-needed.patch | 0 002-doc-dep.patch | 42 ++++++++++++++++++ p11-kit-0.23.22.tar.xz.sig | Bin 580 -> 0 bytes p11-kit.spec | 21 ++++----- sources | 1 + 6 files changed, 55 insertions(+), 10 deletions(-) rename p11-kit-dt-needed.patch => 001-dt-needed.patch (100%) create mode 100644 002-doc-dep.patch delete mode 100644 p11-kit-0.23.22.tar.xz.sig diff --git a/.gitignore b/.gitignore index c584144..2109456 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ SOURCES/gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg SOURCES/p11-kit-0.23.22.tar.xz /gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg /p11-kit-0.23.22.tar.xz +/p11-kit-0.23.22.tar.xz.sig diff --git a/p11-kit-dt-needed.patch b/001-dt-needed.patch similarity index 100% rename from p11-kit-dt-needed.patch rename to 001-dt-needed.patch diff --git a/002-doc-dep.patch b/002-doc-dep.patch new file mode 100644 index 0000000..c173db9 --- /dev/null +++ b/002-doc-dep.patch @@ -0,0 +1,42 @@ +From 9f01a8a45ba913a9b65894cef9369b6010005096 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 23:25:05 -0500 +Subject: [PATCH] gtkdoc: remove dependencies on custom target files + +Sadly, the `dependencies` kwarg does not actually do what it seems to be +trying to be used for, here. It is for listing dependency or library +objects whose compiler flags should be added to gtkdoc-scangobj. + +It will not actually add ninja target dependencies. The similar kwarg in +other meson functions (e.g. genmarshal and compile_schemas) that *do* +allow adding target dependencies, is `depend_files`. + +Older versions of meson simply did nothing in an if/elif/elif block +where these custom_targets never matched anything, and were thus +silently ignored. + +Meson 0.61 type-validates the arguments and rejects CustomTarget as +invalid: + +``` +doc/manual/meson.build:72:8: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget | PkgConfigDependency] but should have been array[Dependency | SharedLibrary | StaticLibrary] +``` + +Fixes #406 +--- + doc/manual/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/manual/meson.build b/doc/manual/meson.build +index cf8758dbf..560df8dbc 100644 +--- a/doc/manual/meson.build ++++ b/doc/manual/meson.build +@@ -73,7 +73,7 @@ if get_option('gtk_doc') + main_xml: 'p11-kit-docs.xml', + namespace: 'p11_kit', + src_dir: 'p11-kit', +- dependencies: libffi_deps + dlopen_deps + xml_deps, ++ dependencies: libffi_deps + dlopen_deps, + scan_args: [ + '--ignore-headers=' + ' '.join(ignore_headers), + '--rebuild-types', diff --git a/p11-kit-0.23.22.tar.xz.sig b/p11-kit-0.23.22.tar.xz.sig deleted file mode 100644 index 6ef001e021400211896d7cde2ea969d72b40170c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmV-K0=xZ*0zm`-0SEvq79j*iA|=DLZ#0LW$VqJ01%!^*=9qB>0$%}}C%`sX#k z@+EO&X5M!|dst(0s5|j5m1?1%0~dJ`75%cn3J#s=x=}o1hsqG&!AGl(hlLx07ZB6p zX^{axJG#awb}+EUx;PXz?{6idTYHZLv}TmG@> z(W`r-gPNK=pF4l})bSf{<_QJQ+Q7p*#q+fCSP@s5EeuqXn|x)J5PcnZ^V8NQCUC}z zckYB6Rl!(biwMPzMwFZ~^=L&`-(f7ZxY_<trH*LCoj-nr+1ROgzJI_YQg+o#?FtlO@J#aWiAT9>PZ29zN7%qwJ8eV+g%FOc0@ zT9W8O6&5X5wDgoxl*+tugScihD|p#TPFd)hKrqgA=O0ZE(`hlkT_mj7a!0wWfMdI diff --git a/p11-kit.spec b/p11-kit.spec index 7d0e73b..d22f0ce 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,10 +1,10 @@ # This spec file has been automatically updated -Version: 0.23.22 -Release: 1%{?dist} +Version: 0.23.22 +Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules -License: BSD +License: BSD-3-Clause URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz.sig @@ -12,7 +12,8 @@ Source2: gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg Source3: trust-extract-compat Source4: p11-kit-client.service -Patch1: p11-kit-dt-needed.patch +Patch0: 001-dt-needed.patch +Patch1: 002-doc-dep.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 @@ -26,6 +27,7 @@ BuildRequires: bash-completion # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(systemd) BuildRequires: gnupg2 BuildRequires: /usr/bin/xsltproc @@ -47,13 +49,13 @@ developing applications that use %{name}. %package trust Summary: System trust module from %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): %{_sbindir}/alternatives +Requires(postun): %{_sbindir}/alternatives Conflicts: nss < 3.14.3-9 %description trust The %{name}-trust package contains a system trust PKCS#11 module which -contains certificate anchors and black lists. +contains certificate anchors and blocklists. %package server @@ -102,13 +104,12 @@ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir} %post trust -%{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so \ - %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 +%{_sbindir}/alternatives --install %{_libdir}/libnssckbi.so %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 %postun trust if [ $1 -eq 0 ] ; then # package removal - %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so + %{_sbindir}/alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so fi diff --git a/sources b/sources index ef7c191..8b2044b 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg) = 177e5856fa0f0d542e8014f1beffafcd0b655c842f6a69236f26d628ed7b4bbebb5767c889e5e59ba285f65625eb024a4d754da1bcdd714274820f7206408c86 SHA512 (p11-kit-0.23.22.tar.xz) = 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080 +SHA512 (p11-kit-0.23.22.tar.xz.sig) = ecceb637852527c81a032160c5a831e92cf140335aa756c5de1531046843a9041613c7750086e3c2dd1c55c6224422dc07226b4bebff56926f1e9cedc6d73d83