kpvdr pushed to rpms/qpid-proton (f36). "Added debug stmt for whl
file issue"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 21:49:07 UTC
From 8f18a042fcec98bd2bbb23f2708af64fe0410b8b Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvanderr(a)redhat.com>
Date: Mar 31 2023 21:48:55 +0000
Subject: Added debug stmt for whl file issue
---
diff --git a/qpid-proton.spec b/qpid-proton.spec
index ba35adf..c0c671f 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -239,6 +239,7 @@ rm -rf build
# library to be installed so we don't duplicate it inside the extension
# That is also why we have to point pkg-config at the installed library
PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig %py3_build_wheel
+ls -la *.whl
%py3_install_wheel python_qpid_proton-%{version}-cp310-cp310-linux_%{_arch}.whl
# We seem to need to strip the build extension otherwise it seems to embed a reference to
# the buildroot in the debug info which fails the rpmbuild - probably because we massaged
https://src.fedoraproject.org/rpms/qpid-proton/c/8f18a042fcec98bd2bbb23f2...
1Â year, 2Â months
bgurney pushed to rpms/stratis-cli (f37). "Update to 3.5.1 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 21:44:00 UTC
From 439247e3c9897559ba9ddf73e95365ef0f43db6c Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney(a)redhat.com>
Date: Mar 31 2023 21:43:35 +0000
Subject: Update to 3.5.1
Signed-off-by: Bryan Gurney <bgurney(a)redhat.com>
---
diff --git a/.gitignore b/.gitignore
index 709f423..19f7aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/stratis-cli-3.4.0.tar.gz
/stratis-cli-3.4.1.tar.gz
/stratis-cli-3.5.0.tar.gz
+/stratis-cli-3.5.1.tar.gz
diff --git a/sources b/sources
index 1af1dc6..4a10e21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stratis-cli-3.5.0.tar.gz) = e67b8531c662c9a01aff4633d73c492d48ad2409f9a4d7c68aaf12549dbdc4bdcefae2c74265a6c535fca5bc8ee1d0c8de78b67ed57404686bd35e1474bae65b
+SHA512 (stratis-cli-3.5.1.tar.gz) = f32854b458f2e61f1bad664894fd8a59ce3ea7351c1adb73c750f2bf9c4795801e9398c6109a13fd7c2af136757a26551c2f7dbc30443743400f27358b357d82
diff --git a/stratis-cli.spec b/stratis-cli.spec
index 88789d7..4d15a83 100644
--- a/stratis-cli.spec
+++ b/stratis-cli.spec
@@ -1,5 +1,5 @@
Name: stratis-cli
-Version: 3.5.0
+Version: 3.5.1
Release: 1%{?dist}
Summary: Command-line tool for interacting with the Stratis daemon
@@ -62,6 +62,9 @@ a2x -f manpage docs/stratis.txt
%{python3_sitelib}/stratis_cli-*.egg-info/
%changelog
+* Fri Mar 31 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.1-1
+- Update to 3.5.1
+
* Wed Jan 25 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.0-1
- Update to 3.5.0
diff --git a/tests/tests.yml b/tests/tests.yml
index ab18c9f..29d1bf6 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -15,4 +15,4 @@
repositories:
- repo: "https://github.com/stratis-storage/testing.git"
dest: "testing"
- version: "v3.5.0"
+ version: "v3.5.1"
https://src.fedoraproject.org/rpms/stratis-cli/c/439247e3c9897559ba9ddf73...
1Â year, 2Â months
bgurney pushed to rpms/stratis-cli (f38). "Update to 3.5.1 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 21:33:49 UTC
From 467268e7c051a9dc5b8551e6c2ae74e00633e6b3 Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney(a)redhat.com>
Date: Mar 31 2023 21:33:27 +0000
Subject: Update to 3.5.1
Signed-off-by: Bryan Gurney <bgurney(a)redhat.com>
---
diff --git a/.gitignore b/.gitignore
index 709f423..19f7aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/stratis-cli-3.4.0.tar.gz
/stratis-cli-3.4.1.tar.gz
/stratis-cli-3.5.0.tar.gz
+/stratis-cli-3.5.1.tar.gz
diff --git a/sources b/sources
index 1af1dc6..4a10e21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stratis-cli-3.5.0.tar.gz) = e67b8531c662c9a01aff4633d73c492d48ad2409f9a4d7c68aaf12549dbdc4bdcefae2c74265a6c535fca5bc8ee1d0c8de78b67ed57404686bd35e1474bae65b
+SHA512 (stratis-cli-3.5.1.tar.gz) = f32854b458f2e61f1bad664894fd8a59ce3ea7351c1adb73c750f2bf9c4795801e9398c6109a13fd7c2af136757a26551c2f7dbc30443743400f27358b357d82
diff --git a/stratis-cli.spec b/stratis-cli.spec
index 72b33f1..37fafd7 100644
--- a/stratis-cli.spec
+++ b/stratis-cli.spec
@@ -1,5 +1,5 @@
Name: stratis-cli
-Version: 3.5.0
+Version: 3.5.1
Release: 1%{?dist}
Summary: Command-line tool for interacting with the Stratis daemon
@@ -62,6 +62,9 @@ a2x -f manpage docs/stratis.txt
%{python3_sitelib}/stratis_cli-*.egg-info/
%changelog
+* Fri Mar 31 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.1-1
+- Update to 3.5.1
+
* Tue Jan 24 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.0-1
- Update to 3.5.0
diff --git a/tests/tests.yml b/tests/tests.yml
index ab18c9f..29d1bf6 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -15,4 +15,4 @@
repositories:
- repo: "https://github.com/stratis-storage/testing.git"
dest: "testing"
- version: "v3.5.0"
+ version: "v3.5.1"
https://src.fedoraproject.org/rpms/stratis-cli/c/467268e7c051a9dc5b8551e6...
1Â year, 2Â months
bgurney pushed to rpms/stratis-cli (rawhide). "Update to 3.5.1 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 21:27:55 UTC
From 5ba506b40a3ba338ee905be119396e3b9b9875fc Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney(a)redhat.com>
Date: Mar 31 2023 21:23:40 +0000
Subject: Update to 3.5.1
Signed-off-by: Bryan Gurney <bgurney(a)redhat.com>
---
diff --git a/.gitignore b/.gitignore
index 709f423..19f7aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/stratis-cli-3.4.0.tar.gz
/stratis-cli-3.4.1.tar.gz
/stratis-cli-3.5.0.tar.gz
+/stratis-cli-3.5.1.tar.gz
diff --git a/sources b/sources
index 1af1dc6..4a10e21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stratis-cli-3.5.0.tar.gz) = e67b8531c662c9a01aff4633d73c492d48ad2409f9a4d7c68aaf12549dbdc4bdcefae2c74265a6c535fca5bc8ee1d0c8de78b67ed57404686bd35e1474bae65b
+SHA512 (stratis-cli-3.5.1.tar.gz) = f32854b458f2e61f1bad664894fd8a59ce3ea7351c1adb73c750f2bf9c4795801e9398c6109a13fd7c2af136757a26551c2f7dbc30443743400f27358b357d82
diff --git a/stratis-cli.spec b/stratis-cli.spec
index 72b33f1..37fafd7 100644
--- a/stratis-cli.spec
+++ b/stratis-cli.spec
@@ -1,5 +1,5 @@
Name: stratis-cli
-Version: 3.5.0
+Version: 3.5.1
Release: 1%{?dist}
Summary: Command-line tool for interacting with the Stratis daemon
@@ -62,6 +62,9 @@ a2x -f manpage docs/stratis.txt
%{python3_sitelib}/stratis_cli-*.egg-info/
%changelog
+* Fri Mar 31 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.1-1
+- Update to 3.5.1
+
* Tue Jan 24 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.0-1
- Update to 3.5.0
diff --git a/tests/tests.yml b/tests/tests.yml
index ab18c9f..29d1bf6 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -15,4 +15,4 @@
repositories:
- repo: "https://github.com/stratis-storage/testing.git"
dest: "testing"
- version: "v3.5.0"
+ version: "v3.5.1"
https://src.fedoraproject.org/rpms/stratis-cli/c/5ba506b40a3ba338ee905be1...
1Â year, 2Â months
pagure pushed to rpms/gdb (rawhide). "Backport "Fix crash in
inside_main_func" (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 21:06:53 UTC
From 33590be3ac8403a9a74742c3c9d7461606a85ba5 Mon Sep 17 00:00:00 2001
From: Keith Seitz <keiths(a)redhat.com>
Date: Mar 31 2023 20:14:15 +0000
Subject: Backport "Fix crash in inside_main_func"
Resolves: rhbz#2183595
---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index c51abfc..a5806be 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -232,3 +232,7 @@ Patch054: gdb-rhbz1553104-s390x-arch12-test.patch
# [aarch64] Backport fix from Luis Machado for RH BZ 2177655.
Patch055: gdb-rhbz2177655-aarch64-pauth-valid-regcache.patch
+# Backport "Fix crash in inside_main_func"
+# (Tom Tromey, RHBZ 2183595)
+Patch056: gdb-rhbz2183595-rustc-inside_main.patch
+
diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index b72c412..46efc44 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -53,3 +53,4 @@
%patch -p1 -P053
%patch -p1 -P054
%patch -p1 -P055
+%patch -p1 -P056
diff --git a/_patch_order b/_patch_order
index 8108523..1c80644 100644
--- a/_patch_order
+++ b/_patch_order
@@ -53,3 +53,4 @@ gdb-linux_perf-bundle.patch
gdb-libexec-add-index.patch
gdb-rhbz1553104-s390x-arch12-test.patch
gdb-rhbz2177655-aarch64-pauth-valid-regcache.patch
+gdb-rhbz2183595-rustc-inside_main.patch
diff --git a/gdb-rhbz2183595-rustc-inside_main.patch b/gdb-rhbz2183595-rustc-inside_main.patch
new file mode 100644
index 0000000..16a77b6
--- /dev/null
+++ b/gdb-rhbz2183595-rustc-inside_main.patch
@@ -0,0 +1,136 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Tom Tromey <tromey(a)adacore.com>
+Date: Fri, 24 Feb 2023 10:40:16 -0700
+Subject: gdb-rhbz2183595-rustc-inside_main.patch
+
+;; Backport "Fix crash in inside_main_func"
+;; (Tom Tromey, RHBZ 2183595)
+
+gdb 13.1 crashes while running the rust compiler's debugger tests.
+The crash has a number of causes.
+
+First, the rust compiler still uses the C++-like _Z mangling, but with
+its own twist -- some hex digits added to the end of a symbol. So,
+while gdb finds the correct name of "main":
+
+(top-gdb) p name
+$13 = 0x292e0c0 "rustc_gdb_1031745::main"
+
+It isn't found in the minsyms, because C++ demangling yields:
+
+[99] t 0x90c0 _ZN17rustc_gdb_10317454main17h5b5be7fe16a97225E section .text rustc_gdb_1031745::main::h5b5be7fe16a97225 zko06yobckx336v
+
+This could perhaps be fixed. I also filed a new PR to suggest
+preferring the linkage name of the main program.
+
+Next, the rust compiler emits both a DW_TAG_subprogram and a
+DW_TAG_namespace for "main". This happens because the file is named
+"main.rs" -- i.e., the bug is specific to the source file name. The
+crash also seems to require the nested function inside of 'main', at
+least for me. The namespace always is generated, but perhaps this
+changes the ordering in the DWARF.
+
+When inside_main_func looks up the main symbol, it finds the namespace
+symbol rather than the function. (I filed a bug about fixing gdb's
+symbol tables -- long overdue.)
+
+Meanwhile, as I think it's important to fix this crash sooner rather
+than later, this patch changes inside_main_func to check that the
+symbol that is found is LOC_BLOCK. This perhaps should have been done
+in the first place, anyway.
+
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30158
+
+diff --git a/gdb/frame.c b/gdb/frame.c
+--- a/gdb/frame.c
++++ b/gdb/frame.c
+@@ -2453,6 +2453,14 @@ inside_main_func (frame_info_ptr this_frame)
+ if (bs.symbol == nullptr)
+ return false;
+
++ /* We might have found some unrelated symbol. For example, the
++ Rust compiler can emit both a subprogram and a namespace with
++ the same name in the same scope; and due to how gdb's symbol
++ tables currently work, we can't request the one we'd
++ prefer. */
++ if (bs.symbol->aclass () != LOC_BLOCK)
++ return false;
++
+ const struct block *block = bs.symbol->value_block ();
+ gdb_assert (block != nullptr);
+ sym_addr = block->start ();
+diff --git a/gdb/testsuite/gdb.rust/main-crash.exp b/gdb/testsuite/gdb.rust/main-crash.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.rust/main-crash.exp
+@@ -0,0 +1,35 @@
++# Copyright (C) 2023 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++# Regression test for a crash in inside_main_func.
++
++load_lib rust-support.exp
++require allow_rust_tests
++
++standard_testfile main.rs
++if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
++ {debug rust}]} {
++ return -1
++}
++
++set line [gdb_get_line_number "BREAK"]
++# The bug was that this would crash.
++if {![runto ${srcfile}:$line]} {
++ untested "could not run to breakpoint"
++ return -1
++}
++
++# Test that gdb is alive.
++gdb_test "print 23" " = 23"
+diff --git a/gdb/testsuite/gdb.rust/main.rs b/gdb/testsuite/gdb.rust/main.rs
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.rust/main.rs
+@@ -0,0 +1,30 @@
++// Copyright (C) 2016-2023 Free Software Foundation, Inc.
++
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 3 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++#![allow(dead_code)]
++#![allow(unused_variables)]
++#![allow(unused_assignments)]
++
++fn global_fn(x: u8) {
++ // BREAK
++}
++
++fn main() {
++ fn nested(y: u8) {
++ global_fn(y)
++ }
++
++ nested(23);
++}
diff --git a/gdb.spec b/gdb.spec
index 486d41b..886616c 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -57,7 +57,7 @@ Version: 13.1
# The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
# Do not provide URL for snapshots as the file lasts there only for 2 days.
@@ -1249,6 +1249,10 @@ fi
%endif
%changelog
+* Fri Mar 31 2023 Keith Seitz <keiths(a)redhat.com> - 13.1-4
+- Backport "Fix crash in inside_main_func"
+ (Tom Tromey, RHBZ 2183595)
+
* Thu Mar 30 2023 Alexandra Hájková <ahajkova(a)redhat.com> - 12.1-3
- Update gdb-6.6-buildid-locate.patch to fix RHBZ 2181221.
https://src.fedoraproject.org/rpms/gdb/c/33590be3ac8403a9a74742c3c9d74616...
1Â year, 2Â months
mikelo2 pushed to rpms/gitleaks (f36). "Update to 8.16.2 - Closes
rhbz#2183584"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 20:57:04 UTC
From 33da64a277b3a1af7395fe90a3912a55aed05673 Mon Sep 17 00:00:00 2001
From: Mikel Olasagasti Uranga <mikel(a)olasagasti.info>
Date: Mar 31 2023 20:31:53 +0000
Subject: Update to 8.16.2 - Closes rhbz#2183584
---
diff --git a/.gitignore b/.gitignore
index 3268f6a..9eb6dac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/gitleaks-8.15.4.tar.gz
/gitleaks-8.16.0.tar.gz
/gitleaks-8.16.1.tar.gz
+/gitleaks-8.16.2.tar.gz
diff --git a/gitleaks.spec b/gitleaks.spec
index 23dce4a..241b0fe 100644
--- a/gitleaks.spec
+++ b/gitleaks.spec
@@ -4,7 +4,7 @@
# https://github.com/zricethezav/gitleaks
%global forgeurl https://github.com/zricethezav/gitleaks
%global goipath github.com/zricethezav/gitleaks/v8
-Version: 8.16.1
+Version: 8.16.2
%gometa -f
diff --git a/sources b/sources
index 4282eaf..6bae71a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gitleaks-8.16.1.tar.gz) = db667ca9d33550b124ea00965bb4bef32fa3c710ab155728bdbc7bc462bef2462200eaef51471e6f8d5c713f5da19e0688964e140840cf81709bd9ef0764b9c5
+SHA512 (gitleaks-8.16.2.tar.gz) = c8ec78bf358bc771b068a21ee873d7e9316111e32649eea4f6c95954919458e0b5c9a764056352ff735eadff930ff4bc31da142e0acd5f9498a07eef13b1d859
https://src.fedoraproject.org/rpms/gitleaks/c/33da64a277b3a1af7395fe90a39...
1Â year, 2Â months
kpvdr pushed to rpms/qpid-proton (epel8). "Rebased to 0.38.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 20:54:52 UTC
From 2d5135b2118c826462262c703d236efbd5b26320 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvanderr(a)redhat.com>
Date: Mar 31 2023 20:54:37 +0000
Subject: Rebased to 0.38.0
---
diff --git a/licenses.xml b/licenses.xml
index 780a10c..5a701c5 100644
--- a/licenses.xml
+++ b/licenses.xml
@@ -3,7 +3,7 @@
<dependencies>
<dependency>
<packageName>qpid-proton</packageName>
- <version>0.37.0</version>
+ <version>0.38.0</version>
<licenses>
<license>
<name>ASL 2.0</name>
diff --git a/proton.patch b/proton.patch
index 82593f8..c9fc8f4 100644
--- a/proton.patch
+++ b/proton.patch
@@ -1,18 +1,51 @@
-From c2256a4ed949bad6b85086113dc570472a0f7c11 Mon Sep 17 00:00:00 2001
-From: Irina Boverman <iboverma(a)redhat.com>
-Date: Tue, 4 May 2021 14:12:53 -0400
-Subject: [PATCH] Changed Sphinx invocation from sphinx to sphinx-build for
- RHEL7
+diff -ruN qpid-proton-0.38.0.orig/CMakeLists.txt qpid-proton-0.38.0/CMakeLists.txt
+--- qpid-proton-0.38.0.orig/CMakeLists.txt 2022-11-07 11:35:09.000000000 -0500
++++ qpid-proton-0.38.0/CMakeLists.txt 2022-11-23 10:19:17.963751717 -0500
+@@ -42,7 +42,7 @@
+ if (NOT DEFINED Python_FIND_FRAMEWORK)
+ set(Python_FIND_FRAMEWORK "LAST")
+ endif ()
+-find_package(Python 3.6
++find_package(Python 3.9
+ REQUIRED COMPONENTS Interpreter
+ OPTIONAL_COMPONENTS Development)
----
- python/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+diff -ruN qpid-proton-0.38.0.orig/cpp/src/map_test.cpp qpid-proton-0.38.0/cpp/src/map_test.cpp
+--- qpid-proton-0.38.0.orig/cpp/src/map_test.cpp 2022-11-07 11:35:09.000000000 -0500
++++ qpid-proton-0.38.0/cpp/src/map_test.cpp 2023-01-26 10:49:44.159634165 -0500
+@@ -114,6 +114,20 @@
+ ASSERT_THROWS(conversion_error, m.value(bad));
+ }
-diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
-index 44bc36a..e7d0f10 100644
---- a/python/CMakeLists.txt
-+++ b/python/CMakeLists.txt
-@@ -125,7 +125,7 @@ else ()
++void test_copy_constructor() {
++ proton::map<string, scalar> m = std::map<string, scalar>{{"a", 2}, {"b", 3}};
++ ASSERT_EQUAL(scalar(2), m.get("a"));
++ ASSERT_EQUAL(scalar(3), m.get("b"));
++ ASSERT_EQUAL(2U, m.size());
++}
++
++void test_initializer_list_constructor() {
++ proton::map<string, scalar> m({{"a", 2}, {"b", 3}});
++ ASSERT_EQUAL(scalar(2), m.get("a"));
++ ASSERT_EQUAL(scalar(3), m.get("b"));
++ ASSERT_EQUAL(2U, m.size());
++}
++
+ }
+
+ int main(int, char**) {
+@@ -122,5 +136,7 @@
+ RUN_TEST(failed, test_use());
+ RUN_TEST(failed, test_cppmap());
+ RUN_TEST(failed, test_value());
++ RUN_TEST(failed, test_copy_constructor());
++ RUN_TEST(failed, test_initializer_list_constructor());
+ return failed;
+ }
+diff -ruN qpid-proton-0.38.0.orig/python/CMakeLists.txt qpid-proton-0.38.0/python/CMakeLists.txt
+--- qpid-proton-0.38.0.orig/python/CMakeLists.txt 2022-11-07 11:35:09.000000000 -0500
++++ qpid-proton-0.38.0/python/CMakeLists.txt 2022-11-23 10:20:07.216991810 -0500
+@@ -101,7 +101,7 @@
COMMAND ${PN_ENV_SCRIPT} --
PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}
LD_LIBRARY_PATH="${CMAKE_CURRENT_BINARY_DIR}/c"
@@ -21,6 +54,3 @@ index 44bc36a..e7d0f10 100644
add_dependencies(docs docs-py)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docs/"
DESTINATION "${PROTON_SHARE}/docs/api-py"
---
-1.8.3.1
-
diff --git a/qpid-proton.spec b/qpid-proton.spec
index 2bf108e..edf9ee9 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -1,5 +1,4 @@
%global proton_datadir %{_datadir}/proton
-%global gem_name qpid_proton
# per https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering...
%global __provides_exclude_from ^%{proton_datadir}/examples/.*$
@@ -8,8 +7,9 @@
%undefine __brp_mangle_shebangs
Name: qpid-proton
-Version: 0.37.0
+Version: 0.38.0
Release: 1%{?dist}
+Group: System Environment/Libraries
Summary: A high performance, lightweight messaging library
License: ASL 2.0
URL: http://qpid.apache.org/proton/
@@ -20,6 +20,8 @@ Patch0: proton.patch
Source1: licenses.xml
%global proton_licensedir %{_licensedir}/proton
+%{!?_licensedir:%global license %doc}
+%{!?_licensedir:%global proton_licensedir %{proton_datadir}}
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -27,16 +29,17 @@ BuildRequires: cmake
BuildRequires: swig
BuildRequires: pkgconfig
BuildRequires: doxygen
-BuildRequires: python3-sphinx
BuildRequires: libuuid-devel
BuildRequires: openssl-devel
-BuildRequires: python3-devel
+BuildRequires: python39-devel
+Buildrequires: python39-pip
+BuildRequires: python39-rpm-macros
+BuildRequires: python39-wheel
BuildRequires: glibc-headers
BuildRequires: cyrus-sasl-devel
BuildRequires: jsoncpp-devel
-BuildRequires: python3-setuptools
-BuildRequires: ruby-devel
-BuildRequires: rubygems-devel
+BuildRequires: python39-setuptools
+#BuildRequires: opentelemetry-cpp-devel
%description
Proton is a high performance, lightweight messaging library. It can be used in
@@ -72,8 +75,10 @@ Obsoletes: qpid-proton
%package cpp
Group: System Environment/Libraries
Summary: C++ libraries for Qpid Proton
-Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
-#Requires: jsoncpp
+Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
+Requires: jsoncpp
+#Requires: opentelemetry-cpp
+
%description cpp
%{summary}.
@@ -131,7 +136,7 @@ Summary: Development libraries for writing messaging apps with Qpid Proton
Summary: Documentation for the C development libraries for Qpid Proton
BuildArch: noarch
Obsoletes: qpid-proton-c-devel-doc
-Obsoletes: qpid-proton-c-devel-docs
+Obsoletes: qpid-proton-c-devel-docs
%description c-docs
%{summary}.
@@ -164,23 +169,23 @@ Obsoletes: qpid-proton-cpp-devel-docs
%doc %{proton_datadir}/examples/cpp/README.dox
%doc %{proton_datadir}/examples/cpp/CMakeLists.txt
%doc %{proton_datadir}/examples/cpp/ssl-certs
+%doc %{proton_datadir}/examples/cpp/tracing.dox
%doc %{proton_datadir}/examples/cpp/tutorial.dox
-%package -n python3-qpid-proton
+%package -n python39-qpid-proton
Summary: Python language bindings for the Qpid Proton messaging framework
-%{?python_provide:%python_provide python3-qpid-proton}
Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
-Requires: python3
+Requires: python39
-%description -n python3-qpid-proton
+%description -n python39-qpid-proton
%{summary}.
-%files -n python3-qpid-proton
+%files -n python39-qpid-proton
%{python3_sitearch}/__pycache__/*
%{python3_sitearch}/*.so
%{python3_sitearch}/*.py*
-%{python3_sitearch}/*.egg-info
%{python3_sitearch}/proton
+%{python3_sitearch}/python_qpid_proton-%{version}.dist-info/*
%package -n python-qpid-proton-docs
@@ -193,9 +198,9 @@ Obsoletes: python-qpid-proton-doc
%files -n python-qpid-proton-docs
%license %{proton_licensedir}/LICENSE.txt
-%doc %{proton_datadir}/docs/api-py
%doc %{proton_datadir}/examples/python
+
%package tests
Group: Documentation
Summary: Qpid Proton Tests
@@ -207,29 +212,6 @@ BuildArch: noarch
%files tests
%defattr(-,root,root,-)
%doc %{proton_datadir}/tests
-%exclude %{proton_datadir}/tests/py/*.pyo
-%exclude %{proton_datadir}/tests/py/*.pyc
-
-
-%package -n rubygem-%{gem_name}
-Group: System Environment/Libraries
-Summary: Ruby language bindings for the Qpid Proton messaging framework
-Obsoletes: rubygem-%{gem_name}-doc
-
-%description -n rubygem-%{gem_name}
-Proton is a high performance, lightweight messaging library. It can be used in
-the widest range of messaging applications including brokers, client libraries,
-routers, bridges, proxies, and more. Proton is based on the AMQP 1.0 messaging
-standard.
-
-%files -n rubygem-%{gem_name}
-%dir %{gem_instdir}
-%{gem_libdir}
-%{gem_extdir_mri}
-%exclude %{gem_cache}
-%{gem_spec}
-%doc %{gem_instdir}/examples
-%doc %{gem_instdir}/tests
%prep
@@ -238,46 +220,45 @@ standard.
%build
+python_executable=$(ls /usr/bin/python3.9)
+python_includes=$(ls -d /usr/include/python3.9*)
+python_lib=$(ls /usr/**/libpython3.9*.so)
-python_includes=$(ls -d /usr/include/python3.6*)
-python_lib=$(ls /usr/**/libpython3.6*.so)
-
-mkdir build; cd build
-
+mkdir -p BLD
+cd BLD
%cmake \
- -DSYSINSTALL_BINDINGS=ON \
-DCMAKE_SKIP_RPATH:BOOL=OFF \
- "-DPYTHON_EXECUTABLE=%{__python3}" \
+ "-DPYTHON_EXECUTABLE=$python_executable" \
"-DPYTHON_INCLUDE_DIR=$python_includes" \
"-DPYTHON_LIBRARY=$python_lib" \
..
make all docs %{?_smp_mflags}
-(cd python/dist; %py3_build)
%install
rm -rf %{buildroot}
-cd build
+cd BLD
%make_install
-(cd python/dist; %py3_install)
-chmod +x %{buildroot}%{python3_sitearch}/_cproton.so
+(cd python/dist
+# Need to remove anything built by the python cmake build in proton
+# so that we rebuild from scratch
+rm -rf build
+# Need to do the python package build here as we rely on the qpid-proton-core
+# library to be installed so we don't duplicate it inside the extension
+# That is also why we have to point pkg-config at the installed library
+PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig %py3_build_wheel
+%py3_install_wheel python_qpid_proton-%{version}-cp39-cp39-linux_%{_arch}.whl
+# We seem to need to strip the build extension otherwise it seems to embed a reference to
+# the buildroot in the debug info which fails the rpmbuild - probably because we massaged
+# the pkgconfig path above
+strip %{buildroot}%{python3_sitearch}/_cproton*.so)
install -dm 755 %{buildroot}%{proton_licensedir}
install -pm 644 %{SOURCE1} %{buildroot}%{proton_licensedir}
install -pm 644 %{buildroot}%{proton_datadir}/LICENSE.txt %{buildroot}%{proton_licensedir}
rm -f %{buildroot}%{proton_datadir}/LICENSE.txt
-cd ruby/gem/
-mkdir -p %{buildroot}%{gem_instdir}
-install -dm 755 %{buildroot}%{gem_dir}/specifications
-mkdir -p %{buildroot}%{gem_extdir_mri}
-cp -a %{buildroot}%{ruby_vendorarchdir}/cproton.so %{buildroot}%{gem_extdir_mri}/
-touch %{buildroot}%{gem_extdir_mri}/gem.build_complete
-chmod 644 %{buildroot}%{gem_extdir_mri}/gem.build_complete
-cp -a examples tests lib %{buildroot}%{gem_instdir}/
-install -pm 644 %{gem_name}.gemspec %{buildroot}%{gem_spec}
-
# clean up files that are not shipped
rm -rf %{buildroot}%{_exec_prefix}/bindings
rm -rf %{buildroot}%{_libdir}/java
@@ -285,9 +266,7 @@ rm -rf %{buildroot}%{_libdir}/libproton-jni.so
rm -rf %{buildroot}%{_datarootdir}/java
rm -rf %{buildroot}%{_libdir}/proton.cmake
rm -rf %{buildroot}%{_libdir}/php
-rm -rf %{buildroot}%{_libdir}/ruby
rm -rf %{buildroot}%{_datarootdir}/php
-rm -rf %{buildroot}%{_datarootdir}/ruby
rm -rf %{buildroot}%{_sysconfdir}/php.d
rm -fr %{buildroot}%{proton_datadir}/examples/CMakeFiles
rm -f %{buildroot}%{proton_datadir}/examples/Makefile
@@ -302,6 +281,8 @@ rm -f %{buildroot}%{proton_datadir}/examples/c/receive
rm -f %{buildroot}%{proton_datadir}/examples/c/send
rm -f %{buildroot}%{proton_datadir}/examples/c/send-abort
rm -f %{buildroot}%{proton_datadir}/examples/c/send-ssl
+rm -f %{buildroot}%{proton_datadir}/examples/c/raw_connect
+rm -f %{buildroot}%{proton_datadir}/examples/c/raw_echo
rm -fr %{buildroot}%{proton_datadir}/examples/cpp/CMakeFiles
rm -f %{buildroot}%{proton_datadir}/examples/cpp/*.cmake
rm -f %{buildroot}%{proton_datadir}/examples/cpp/Makefile
@@ -336,14 +317,17 @@ rm -fr %{buildroot}%{proton_datadir}/examples/engine/java
rm -fr %{buildroot}%{proton_datadir}/examples/go
rm -fr %{buildroot}%{proton_datadir}/examples/java
rm -fr %{buildroot}%{proton_datadir}/examples/javascript
-rm -fr %{buildroot}%{proton_datadir}/examples/ruby
rm -fr %{buildroot}%{proton_datadir}/examples/perl
rm -fr %{buildroot}%{proton_datadir}/examples/php
rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
%check
+
%changelog
+* Fri Mar 31 2023 Kim van der Riet <kvanderr(a)redhat.com> - 0.38.0-1
+- Rebased to 0.38.0, opentelemetry-cpp not included as no pkgs in CentOS yet.
+
* Tue Mar 22 2022 Kim van der Riet <kvanderr(a)redhat.com> - 0.37.0-1
- Rebased to 0.37.0
@@ -354,7 +338,7 @@ rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
* Thu Aug 26 2021 Irina Boverman <iboverma(a)redhat.com> - 0.35.0-2
- Added "-DENABLE_LINKTIME_OPTIMIZATION=NO"
-* Tue Jun 16 2021 Kim van der Riet <kvanderr(a)redhat.com> - 0.35.0-1
+*Wed Jun 16 2021 Kim van der Riet <kvanderr(a)redhat.com> - 0.35.0-1
- Rebased to 0.35.0
* Tue May 4 2021 Irina Boverman <iboverma(a)redhat.com> - 0.34.0-1
@@ -398,7 +382,7 @@ rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
- Resolved: ENTMQCL-1294
* Tue Feb 26 2019 Irina Boverman <iboverma(a)redhat.com> - 0.27.0-2
-- Resolved: ENTMQCL-753, ENTMQCL-1200
+- Resolved: ENTMQCL-753, ENTMQCL-1200
* Wed Feb 6 2019 Irina Boverman <iboverma(a)redhat.com> - 0.27.0-1
- Rebased to 0.27.0
@@ -434,7 +418,7 @@ rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
- Rebased to 0.21.0
* Wed Jan 31 2018 Irina Boverman <iboverma(a)redhat.com> - 0.20.0-2
-- Removed ruby files
+- Removed ruby files
* Mon Jan 29 2018 Irina Boverman <iboverma(a)redhat.com> - 0.20.0-1
- Rebased to 0.20.0
@@ -445,7 +429,7 @@ rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
* Mon Jan 8 2018 Irina Boverman <iboverma(a)redhat.com> - 0.18.1-1
- Rebased to 0.18.1
-- Added fixes for ENTMQCL-589 and ENTMQCL-602
+- Added fixes for ENTMQCL-589 and ENTMQCL-602
* Tue Nov 28 2017 Irina Boverman <iboverma(a)redhat.com> - 0.18.0-6
- Added fix for PROTON-1700
@@ -479,7 +463,7 @@ rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
* Thu Dec 8 2016 Irina Boverman <iboverma(a)redhat.com> - 0.16.0-1
- Rebased to 0.16.0-rc1
-- Renamed sub-packages qpid-proton-c-devel-docs/qpid-proton-cpp-devel-docs
+- Renamed sub-packages qpid-proton-c-devel-docs/qpid-proton-cpp-devel-docs
to qpid-proton-c-docs/qpid-proton-cpp-docs
- Removed binary and derived files from qpid-proton-cpp-docs package
diff --git a/sources b/sources
index eeed64e..e64d887 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qpid-proton-0.37.0.tar.gz) = 84d67aab0e81f371fbcee3db89a8a585794966e17ffcd2e2e9418cb587efc0bc4e635c6ce251ebefd716817632ea5b049b759678cebbad64a0d0c07285bd5962
+SHA512 (qpid-proton-0.38.0.tar.gz) = 5333046c954d8b63c59579b05173fa2345e0a61f37a305d23b9e3afee461280c82f9f1c19c30954ba32176ce5fef9ce1f0afc57c99d6c614b2d66cdbb71ff00e
https://src.fedoraproject.org/rpms/qpid-proton/c/2d5135b2118c826462262c70...
1Â year, 2Â months
kpvdr pushed to rpms/qpid-proton (epel9). "Rebased to 0.38.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 20:51:27 UTC
From 1f2f7a698630bf54ff2b3d180aa9b3051716e3fb Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvanderr(a)redhat.com>
Date: Mar 31 2023 20:51:15 +0000
Subject: Rebased to 0.38.0
---
diff --git a/licenses.xml b/licenses.xml
index 780a10c..5a701c5 100644
--- a/licenses.xml
+++ b/licenses.xml
@@ -3,7 +3,7 @@
<dependencies>
<dependency>
<packageName>qpid-proton</packageName>
- <version>0.37.0</version>
+ <version>0.38.0</version>
<licenses>
<license>
<name>ASL 2.0</name>
diff --git a/proton.patch b/proton.patch
index 1a7a696..c9fc8f4 100644
--- a/proton.patch
+++ b/proton.patch
@@ -1,17 +1,51 @@
-From fb76b256a72b2c147e252c3e19fd0523bab1eab8 Mon Sep 17 00:00:00 2001
-From: Irina Boverman <iboverma(a)redhat.com>
-Date: Mon, 28 Jun 2021 10:55:15 -0400
-Subject: [PATCH 1/2] Changed-Sphinx-invocation-from-sphinx-to-sphinx-buil
+diff -ruN qpid-proton-0.38.0.orig/CMakeLists.txt qpid-proton-0.38.0/CMakeLists.txt
+--- qpid-proton-0.38.0.orig/CMakeLists.txt 2022-11-07 11:35:09.000000000 -0500
++++ qpid-proton-0.38.0/CMakeLists.txt 2022-11-23 10:19:17.963751717 -0500
+@@ -42,7 +42,7 @@
+ if (NOT DEFINED Python_FIND_FRAMEWORK)
+ set(Python_FIND_FRAMEWORK "LAST")
+ endif ()
+-find_package(Python 3.6
++find_package(Python 3.9
+ REQUIRED COMPONENTS Interpreter
+ OPTIONAL_COMPONENTS Development)
----
- python/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+diff -ruN qpid-proton-0.38.0.orig/cpp/src/map_test.cpp qpid-proton-0.38.0/cpp/src/map_test.cpp
+--- qpid-proton-0.38.0.orig/cpp/src/map_test.cpp 2022-11-07 11:35:09.000000000 -0500
++++ qpid-proton-0.38.0/cpp/src/map_test.cpp 2023-01-26 10:49:44.159634165 -0500
+@@ -114,6 +114,20 @@
+ ASSERT_THROWS(conversion_error, m.value(bad));
+ }
-diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
-index 06caf61a..f8735fd1 100644
---- a/python/CMakeLists.txt
-+++ b/python/CMakeLists.txt
-@@ -124,7 +124,7 @@ else ()
++void test_copy_constructor() {
++ proton::map<string, scalar> m = std::map<string, scalar>{{"a", 2}, {"b", 3}};
++ ASSERT_EQUAL(scalar(2), m.get("a"));
++ ASSERT_EQUAL(scalar(3), m.get("b"));
++ ASSERT_EQUAL(2U, m.size());
++}
++
++void test_initializer_list_constructor() {
++ proton::map<string, scalar> m({{"a", 2}, {"b", 3}});
++ ASSERT_EQUAL(scalar(2), m.get("a"));
++ ASSERT_EQUAL(scalar(3), m.get("b"));
++ ASSERT_EQUAL(2U, m.size());
++}
++
+ }
+
+ int main(int, char**) {
+@@ -122,5 +136,7 @@
+ RUN_TEST(failed, test_use());
+ RUN_TEST(failed, test_cppmap());
+ RUN_TEST(failed, test_value());
++ RUN_TEST(failed, test_copy_constructor());
++ RUN_TEST(failed, test_initializer_list_constructor());
+ return failed;
+ }
+diff -ruN qpid-proton-0.38.0.orig/python/CMakeLists.txt qpid-proton-0.38.0/python/CMakeLists.txt
+--- qpid-proton-0.38.0.orig/python/CMakeLists.txt 2022-11-07 11:35:09.000000000 -0500
++++ qpid-proton-0.38.0/python/CMakeLists.txt 2022-11-23 10:20:07.216991810 -0500
+@@ -101,7 +101,7 @@
COMMAND ${PN_ENV_SCRIPT} --
PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}
LD_LIBRARY_PATH="${CMAKE_CURRENT_BINARY_DIR}/c"
@@ -20,6 +54,3 @@ index 06caf61a..f8735fd1 100644
add_dependencies(docs docs-py)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docs/"
DESTINATION "${PROTON_SHARE}/docs/api-py"
---
-2.29.0
-
diff --git a/qpid-proton.spec b/qpid-proton.spec
index b53110b..a8f3845 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -1,5 +1,4 @@
%global proton_datadir %{_datadir}/proton
-%global gem_name qpid_proton
%global __cmake_in_source_build 1
%global __provides_exclude_from ^%{proton_datadir}/examples/.*$
@@ -8,8 +7,8 @@
%undefine __brp_mangle_shebangs
Name: qpid-proton
-Version: 0.37.0
-Release: 2%{?dist}
+Version: 0.38.0
+Release: 1%{?dist}
Summary: A high performance, lightweight messaging library
License: ASL 2.0
URL: http://qpid.apache.org/proton/
@@ -33,15 +32,17 @@ BuildRequires: doxygen
BuildRequires: libuuid-devel
BuildRequires: openssl-devel
BuildRequires: python3-devel
+BuildRequires: python3-pip
+BuildRequires: python3-rpm-macros
BuildRequires: python3-sphinx
+BuildRequires: python3-wheel
BuildRequires: glibc-headers
BuildRequires: cyrus-sasl-devel
BuildRequires: jsoncpp-devel
BuildRequires: python3-setuptools
-BuildRequires: ruby-devel
-BuildRequires: rubygems-devel
BuildRequires: libuv-devel
BuildRequires: nspr-devel
+#BuildRequires: opentelemetry-cpp-devel
%description
Proton is a high performance, lightweight messaging library. It can be used in
@@ -77,6 +78,7 @@ Obsoletes: perl-qpid-proton
Summary: C++ libraries for Qpid Proton
Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
Requires: jsoncpp
+#Requires: opentelemetry-cpp
%description cpp
%{summary}.
@@ -163,6 +165,7 @@ Obsoletes: qpid-proton-cpp-devel-docs
%doc %{proton_datadir}/examples/cpp/README.dox
%doc %{proton_datadir}/examples/cpp/CMakeLists.txt
%doc %{proton_datadir}/examples/cpp/ssl-certs
+%doc %{proton_datadir}/examples/cpp/tracing.dox
%doc %{proton_datadir}/examples/cpp/tutorial.dox
@@ -178,8 +181,8 @@ Requires: python3
%{python3_sitearch}/__pycache__/*
%{python3_sitearch}/*.so
%{python3_sitearch}/*.py*
-%{python3_sitearch}/*.egg-info
%{python3_sitearch}/proton
+%{python3_sitearch}/python_qpid_proton-%{version}.dist-info/*
%package -n python-qpid-proton-docs
@@ -199,32 +202,13 @@ Obsoletes: python-qpid-proton-doc
%package tests
Summary: Qpid Proton Tests
BuildArch: noarch
+
%description tests
%{summary}.
%files tests
%doc %{proton_datadir}/tests
-%package -n rubygem-%{gem_name}
-Summary: Ruby language bindings for the Qpid Proton messaging framework
-Requires: qpid-proton-c = %{version}-%{release}
-Obsoletes: rubygem-%{gem_name}-doc
-
-%description -n rubygem-%{gem_name}
-Proton is a high performance, lightweight messaging library. It can be used in
-the widest range of messaging applications including brokers, client libraries,
-routers, bridges, proxies, and more. Proton is based on the AMQP 1.0 messaging
-standard.
-
-%files -n rubygem-%{gem_name}
-%dir %{gem_instdir}
-%{gem_libdir}
-%{gem_extdir_mri}
-%exclude %{gem_cache}
-%{gem_spec}
-%doc %{gem_instdir}/examples
-%doc %{gem_instdir}/tests
-
%prep
%setup -q -n %{name}-%{version}
@@ -232,51 +216,47 @@ standard.
%build
-
-mkdir build
-cd build
+mkdir -p BLD
+cd BLD
%cmake \
- -DSYSINSTALL_BINDINGS=ON \
-DCMAKE_SKIP_RPATH:BOOL=OFF \
"-DCMAKE_C_FLAGS=$CFLAGS -Wno-deprecated-declarations" \
-DENABLE_FUZZ_TESTING=NO \
..
make all docs %{?_smp_mflags}
-(cd python/dist; %py3_build)
%install
rm -rf %{buildroot}
-cd build
+cd BLD
%make_install
-(cd python/dist; %py3_install)
-chmod +x %{buildroot}%{python3_sitearch}/_cproton.so
+(cd python/dist
+# Need to remove anything built by the python cmake build in proton
+# so that we rebuild from scratch
+rm -rf build
+# Need to do the python package build here as we rely on the qpid-proton-core
+# library to be installed so we don't duplicate it inside the extension
+# That is also why we have to point pkg-config at the installed library
+PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig %py3_build_wheel
+%py3_install_wheel python_qpid_proton-%{version}-cp39-cp39-linux_%{_arch}.whl
+# We seem to need to strip the build extension otherwise it seems to embed a reference to
+# the buildroot in the debug info which fails the rpmbuild - probably because we massaged
+# the pkgconfig path above
+strip %{buildroot}%{python3_sitearch}/_cproton*.so)
install -dm 755 %{buildroot}%{proton_licensedir}
install -pm 644 %{SOURCE1} %{buildroot}%{proton_licensedir}
install -pm 644 %{buildroot}%{proton_datadir}/LICENSE.txt %{buildroot}%{proton_licensedir}
rm -f %{buildroot}%{proton_datadir}/LICENSE.txt
-cd ruby/gem/
-mkdir -p %{buildroot}%{gem_instdir}
-install -dm 755 %{buildroot}%{gem_dir}/specifications
-mkdir -p %{buildroot}%{gem_extdir_mri}
-cp -a %{buildroot}%{ruby_vendorarchdir}/cproton.so %{buildroot}%{gem_extdir_mri}/
-touch %{buildroot}%{gem_extdir_mri}/gem.build_complete
-chmod 644 %{buildroot}%{gem_extdir_mri}/gem.build_complete
-cp -a examples tests lib %{buildroot}%{gem_instdir}/
-install -pm 644 %{gem_name}.gemspec %{buildroot}%{gem_spec}
-
# clean up files that are not shipped
rm -rf %{buildroot}%{_exec_prefix}/bindings
rm -rf %{buildroot}%{_libdir}/java
rm -rf %{buildroot}%{_libdir}/libproton-jni.so
rm -rf %{buildroot}%{_datarootdir}/java
rm -rf %{buildroot}%{_libdir}/proton.cmake
-rm -rf %{buildroot}%{_libdir}/ruby
-rm -rf %{buildroot}%{_datarootdir}/ruby
rm -fr %{buildroot}%{proton_datadir}/examples/CMakeFiles
rm -f %{buildroot}%{proton_datadir}/examples/Makefile
rm -f %{buildroot}%{proton_datadir}/examples/*.cmake
@@ -326,7 +306,6 @@ rm -fr %{buildroot}%{proton_datadir}/examples/engine/java
rm -fr %{buildroot}%{proton_datadir}/examples/go
rm -fr %{buildroot}%{proton_datadir}/examples/java
rm -fr %{buildroot}%{proton_datadir}/examples/javascript
-rm -fr %{buildroot}%{proton_datadir}/examples/ruby
rm -fr %{buildroot}%{proton_datadir}/examples/perl
rm -fr %{buildroot}%{proton_datadir}/examples/php
rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
@@ -334,5 +313,8 @@ rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
%check
%changelog
+* Fri Mar 31 2023 Kim van der Riet <kvanderr(a)redhat.com> - 0.38.0-1
+- Rebased to 0.38.0, opentelemetry-cpp not included as no pkgs in centos yet.
+
* Tue Jul 12 2022 Irina Boverman <iboverma(a)redhat.com> - 0.37.0-1
- Initial build for EPEL 9
diff --git a/sources b/sources
index eeed64e..e64d887 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qpid-proton-0.37.0.tar.gz) = 84d67aab0e81f371fbcee3db89a8a585794966e17ffcd2e2e9418cb587efc0bc4e635c6ce251ebefd716817632ea5b049b759678cebbad64a0d0c07285bd5962
+SHA512 (qpid-proton-0.38.0.tar.gz) = 5333046c954d8b63c59579b05173fa2345e0a61f37a305d23b9e3afee461280c82f9f1c19c30954ba32176ce5fef9ce1f0afc57c99d6c614b2d66cdbb71ff00e
https://src.fedoraproject.org/rpms/qpid-proton/c/1f2f7a698630bf54ff2b3d18...
1Â year, 2Â months
mikelo2 pushed to rpms/gitleaks (f37). "Update to 8.16.2 - Closes
rhbz#2183584"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 20:48:34 UTC
From 33da64a277b3a1af7395fe90a3912a55aed05673 Mon Sep 17 00:00:00 2001
From: Mikel Olasagasti Uranga <mikel(a)olasagasti.info>
Date: Mar 31 2023 20:31:53 +0000
Subject: Update to 8.16.2 - Closes rhbz#2183584
---
diff --git a/.gitignore b/.gitignore
index 3268f6a..9eb6dac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/gitleaks-8.15.4.tar.gz
/gitleaks-8.16.0.tar.gz
/gitleaks-8.16.1.tar.gz
+/gitleaks-8.16.2.tar.gz
diff --git a/gitleaks.spec b/gitleaks.spec
index 23dce4a..241b0fe 100644
--- a/gitleaks.spec
+++ b/gitleaks.spec
@@ -4,7 +4,7 @@
# https://github.com/zricethezav/gitleaks
%global forgeurl https://github.com/zricethezav/gitleaks
%global goipath github.com/zricethezav/gitleaks/v8
-Version: 8.16.1
+Version: 8.16.2
%gometa -f
diff --git a/sources b/sources
index 4282eaf..6bae71a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gitleaks-8.16.1.tar.gz) = db667ca9d33550b124ea00965bb4bef32fa3c710ab155728bdbc7bc462bef2462200eaef51471e6f8d5c713f5da19e0688964e140840cf81709bd9ef0764b9c5
+SHA512 (gitleaks-8.16.2.tar.gz) = c8ec78bf358bc771b068a21ee873d7e9316111e32649eea4f6c95954919458e0b5c9a764056352ff735eadff930ff4bc31da142e0acd5f9498a07eef13b1d859
https://src.fedoraproject.org/rpms/gitleaks/c/33da64a277b3a1af7395fe90a39...
1Â year, 2Â months