From 07d588e8bdc7fca344f90a4b531fce8383937f9a07a27b768b375bddccef554a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 6 Apr 2022 07:00:25 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/security/parsec?expand=0&rev=29 --- parsec.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parsec.spec b/parsec.spec index 1378ce2..de3fd25 100644 --- a/parsec.spec +++ b/parsec.spec @@ -42,8 +42,8 @@ BuildRequires: pkgconfig BuildRequires: protobuf-devel BuildRequires: python3 # jwt-svid-authenticator (SPIFFE-based authenticator) needs rust >= 1.53 +BuildRequires: cargo-packaging BuildRequires: rust >= 1.53 -BuildRequires: rust-packaging BuildRequires: sysuser-tools BuildRequires: pkgconfig(tss2-esys) >= 2.3.3 # opensc is used to initialize HSM keys (PKCS#11 backend) From efb1dcbc5df43c15e360aba420ec7034a3566998eaf46ea66c573e64c5c64f82 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 6 Apr 2022 07:01:20 +0000 Subject: [PATCH 2/5] - rust-packaging -> cargo-packaging (bsc#1198131) OBS-URL: https://build.opensuse.org/package/show/security/parsec?expand=0&rev=30 --- parsec.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/parsec.changes b/parsec.changes index 90e66da..6f4f356 100644 --- a/parsec.changes +++ b/parsec.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 6 07:00:43 UTC 2022 - Marcus Meissner + +- rust-packaging -> cargo-packaging (bsc#1198131) + ------------------------------------------------------------------- Thu Mar 31 06:17:05 UTC 2022 - Guillaume GARDET From fb6edb420c5878081481a35e8d322308a81ad9e7ebafcdb9cad1017ca9783f9e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 6 Apr 2022 07:35:54 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/security/parsec?expand=0&rev=31 --- parsec.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/parsec.spec b/parsec.spec index de3fd25..1b14cb8 100644 --- a/parsec.spec +++ b/parsec.spec @@ -96,6 +96,9 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/parsec # Move parsec to _libexecdir mkdir -p %{buildroot}%{_libexecdir} mv target/release/parsec %{buildroot}%{_libexecdir} + +# currently delete it from bin +rm %{buildroot}%{_bindir}/parsec # Clean-up find %{buildroot} -name .crates2.json -delete rm -rf %{buildroot}%{_datadir}/cargo/registry From b665767fcb7d3f2de41c5ba3472651d1b4de0d8acc74627cc28e63e2e32a9b4f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 6 Apr 2022 07:56:56 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/security/parsec?expand=0&rev=32 --- parsec.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/parsec.spec b/parsec.spec index 1b14cb8..16d38e6 100644 --- a/parsec.spec +++ b/parsec.spec @@ -42,7 +42,11 @@ BuildRequires: pkgconfig BuildRequires: protobuf-devel BuildRequires: python3 # jwt-svid-authenticator (SPIFFE-based authenticator) needs rust >= 1.53 +%if %suse_version > 1550 BuildRequires: cargo-packaging +%else +BuildRequires: rust-packaging +%endif BuildRequires: rust >= 1.53 BuildRequires: sysuser-tools BuildRequires: pkgconfig(tss2-esys) >= 2.3.3 From 681a7257ea19de198ce33e0228ac9399eb08e236b80d567e39bf35d49d377667 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 6 Apr 2022 08:42:36 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/security/parsec?expand=0&rev=33 --- parsec.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsec.spec b/parsec.spec index 16d38e6..cff942a 100644 --- a/parsec.spec +++ b/parsec.spec @@ -101,8 +101,8 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/parsec mkdir -p %{buildroot}%{_libexecdir} mv target/release/parsec %{buildroot}%{_libexecdir} -# currently delete it from bin -rm %{buildroot}%{_bindir}/parsec +# currently delete it from bin if there +rm -f %{buildroot}%{_bindir}/parsec # Clean-up find %{buildroot} -name .crates2.json -delete rm -rf %{buildroot}%{_datadir}/cargo/registry