From 118a51e0d3f114d000cbdc36a1b3fae0e76efcb697f580176158c610ffe5c036 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 6 Apr 2023 08:01:19 +0000 Subject: [PATCH 1/2] - Update to version 2+git20230406.d16f026: * Build in place support * merge spec file into git OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=103 --- _service | 3 ++- _servicedata | 2 +- ca-certificates-2+git20210723.27a0476.obscpio | 3 --- ca-certificates-2+git20211004.3efbea9.obscpio | 3 --- ca-certificates-2+git20230406.d16f026.obscpio | 3 +++ ca-certificates.changes | 7 +++++++ ca-certificates.obsinfo | 7 +++---- ca-certificates.spec | 14 ++++++++++++-- 8 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 ca-certificates-2+git20210723.27a0476.obscpio delete mode 100644 ca-certificates-2+git20211004.3efbea9.obscpio create mode 100644 ca-certificates-2+git20230406.d16f026.obscpio diff --git a/_service b/_service index 0c4a926..7e719f2 100644 --- a/_service +++ b/_service @@ -2,9 +2,10 @@ 2 2+git%cd.%h - http://github.com/openSUSE/ca-certificates.git + https://github.com/openSUSE/ca-certificates.git git enable + ca-certificates.spec diff --git a/_servicedata b/_servicedata index 61b058e..b373db1 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ http://github.com/openSUSE/ca-certificates.git - 15986b230062fc4355616d0c63180811704b0933 \ No newline at end of file + d16f02666b959e10f5bc64b6ab26b398f388ad0b \ No newline at end of file diff --git a/ca-certificates-2+git20210723.27a0476.obscpio b/ca-certificates-2+git20210723.27a0476.obscpio deleted file mode 100644 index 9007cf2..0000000 --- a/ca-certificates-2+git20210723.27a0476.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2211e1c02ed594aad85435b2f9b38a6d35ce7028f62c43aba36cf8c30080c148 -size 70667 diff --git a/ca-certificates-2+git20211004.3efbea9.obscpio b/ca-certificates-2+git20211004.3efbea9.obscpio deleted file mode 100644 index 690d943..0000000 --- a/ca-certificates-2+git20211004.3efbea9.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d7174bcd4330c5d5ff9335532d09032335f190bcffa0c94015a2f4def84490c -size 70667 diff --git a/ca-certificates-2+git20230406.d16f026.obscpio b/ca-certificates-2+git20230406.d16f026.obscpio new file mode 100644 index 0000000..afa08eb --- /dev/null +++ b/ca-certificates-2+git20230406.d16f026.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91edf240c1294c6e42aa1e1c4fa5ce56c28fee6a3314aeebc1775dd23e622332 +size 75787 diff --git a/ca-certificates.changes b/ca-certificates.changes index 8437348..f5a5b8f 100644 --- a/ca-certificates.changes +++ b/ca-certificates.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 06 07:59:14 UTC 2023 - lnussel@suse.de + +- Update to version 2+git20230406.d16f026: + * Build in place support + * merge spec file into git + ------------------------------------------------------------------- Mon Oct 04 08:21:06 UTC 2021 - lnussel@suse.de diff --git a/ca-certificates.obsinfo b/ca-certificates.obsinfo index af41e6a..c8bc325 100644 --- a/ca-certificates.obsinfo +++ b/ca-certificates.obsinfo @@ -1,5 +1,4 @@ name: ca-certificates -version: 2+git20211004.3efbea9 -mtime: 1633335598 -commit: 3efbea9d908d0ecf3678aeef8ade884c0c155175 - +version: 2+git20230406.d16f026 +mtime: 1680767654 +commit: d16f02666b959e10f5bc64b6ab26b398f388ad0b diff --git a/ca-certificates.spec b/ca-certificates.spec index 054b1e2..e714976 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -1,7 +1,7 @@ # # spec file for package ca-certificates # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,16 @@ # +%if 0%{?_build_in_place} +%define git_version %(git log '-n1' '--date=format:%Y%m%d' '--no-show-signature' "--pretty=format:+git%cd.%h") +BuildRequires: git-core +%else +# this is required for obs' source validator. It's +# 20-files-present-and-referenced ignores all conditionals. So the +# definition of git_version actually happens always. +%define git_version %{nil} +%endif + # the ca bundle file was meant as compat option for e.g. # proprietary packages. It's not meant to be used at all. # unfortunately glib-networking has such a complicated abstraction @@ -28,7 +38,7 @@ Name: ca-certificates %define ssletcdir %{_sysconfdir}/ssl %define cabundle /var/lib/ca-certificates/ca-bundle.pem %define sslcerts %{ssletcdir}/certs -Version: 2+git20211004.3efbea9 +Version: 2+git20230406.d16f026%{git_version} Release: 0 Summary: Utilities for system wide CA certificate installation License: GPL-2.0-or-later From dc18246d863851ccaea842fed2f81640fcf394f9f08fa4a0ba18ec6a83ab598d Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 6 Apr 2023 08:03:50 +0000 Subject: [PATCH 2/2] fix OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=104 --- _servicedata | 4 +++- ca-certificates-2+git20230406.2dae8b7.obscpio | 3 +++ ca-certificates-2+git20230406.d16f026.obscpio | 3 --- ca-certificates.changes | 5 +++-- ca-certificates.obsinfo | 6 +++--- ca-certificates.spec | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 ca-certificates-2+git20230406.2dae8b7.obscpio delete mode 100644 ca-certificates-2+git20230406.d16f026.obscpio diff --git a/_servicedata b/_servicedata index b373db1..77a3261 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,6 @@ http://github.com/openSUSE/ca-certificates.git - d16f02666b959e10f5bc64b6ab26b398f388ad0b \ No newline at end of file + d16f02666b959e10f5bc64b6ab26b398f388ad0b + https://github.com/openSUSE/ca-certificates.git + 2dae8b77c250506dc1bf862351c3a5de89a08e90 \ No newline at end of file diff --git a/ca-certificates-2+git20230406.2dae8b7.obscpio b/ca-certificates-2+git20230406.2dae8b7.obscpio new file mode 100644 index 0000000..1d8f5d0 --- /dev/null +++ b/ca-certificates-2+git20230406.2dae8b7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:761342aa25abae051436108d8db5c7d810759bed1c8a43b8f50eecde268c8c7e +size 75787 diff --git a/ca-certificates-2+git20230406.d16f026.obscpio b/ca-certificates-2+git20230406.d16f026.obscpio deleted file mode 100644 index afa08eb..0000000 --- a/ca-certificates-2+git20230406.d16f026.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91edf240c1294c6e42aa1e1c4fa5ce56c28fee6a3314aeebc1775dd23e622332 -size 75787 diff --git a/ca-certificates.changes b/ca-certificates.changes index f5a5b8f..c37564f 100644 --- a/ca-certificates.changes +++ b/ca-certificates.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- -Thu Apr 06 07:59:14 UTC 2023 - lnussel@suse.de +Thu Apr 06 08:03:11 UTC 2023 - lnussel@suse.de -- Update to version 2+git20230406.d16f026: +- Update to version 2+git20230406.2dae8b7: * Build in place support + * Fix up argument parsing * merge spec file into git ------------------------------------------------------------------- diff --git a/ca-certificates.obsinfo b/ca-certificates.obsinfo index c8bc325..c5ac13a 100644 --- a/ca-certificates.obsinfo +++ b/ca-certificates.obsinfo @@ -1,4 +1,4 @@ name: ca-certificates -version: 2+git20230406.d16f026 -mtime: 1680767654 -commit: d16f02666b959e10f5bc64b6ab26b398f388ad0b +version: 2+git20230406.2dae8b7 +mtime: 1680768174 +commit: 2dae8b77c250506dc1bf862351c3a5de89a08e90 diff --git a/ca-certificates.spec b/ca-certificates.spec index e714976..7595116 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -38,7 +38,7 @@ Name: ca-certificates %define ssletcdir %{_sysconfdir}/ssl %define cabundle /var/lib/ca-certificates/ca-bundle.pem %define sslcerts %{ssletcdir}/certs -Version: 2+git20230406.d16f026%{git_version} +Version: 2+git20230406.2dae8b7%{git_version} Release: 0 Summary: Utilities for system wide CA certificate installation License: GPL-2.0-or-later