Skip to content

Commit 4eedde9

Browse files
authored
sync RPM spec w/ upstream (#1872)
note: back out gcc-15 patch, since it wouldn't apply in any event
1 parent 72ca66b commit 4eedde9

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

.evergreen/etc/mongo-c-driver.spec

+9-1
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
Name: mongo-c-driver
2828
Summary: Client library written in C for MongoDB
2929
Version: %{up_version}%{?up_prever:~%{up_prever}}
30-
Release: 1%{?dist}
30+
Release: 2%{?dist}
3131
# See THIRD_PARTY_NOTICES
3232
License: Apache-2.0 AND ISC AND MIT AND Zlib
3333
URL: https://github.com/%{gh_owner}/%{gh_project}
3434

3535
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/refs/tags/%{up_version}%{?up_prever:-%{up_prever}}.tar.gz
3636

37+
Patch0: upstream.patch
38+
3739
BuildRequires: cmake >= 3.15
3840
BuildRequires: gcc
3941
BuildRequires: gcc-c++
@@ -128,6 +130,8 @@ Documentation: http://mongoc.org/libbson/%{version}/
128130
%prep
129131
%setup -q -n %{gh_project}-%{up_version}%{?up_prever:-%{up_prever}}
130132

133+
%patch -P0 -p1 -b .up
134+
131135

132136
%build
133137
%cmake \
@@ -259,6 +263,10 @@ exit $ret
259263

260264

261265
%changelog
266+
* Tue Feb 18 2025 Remi Collet <[email protected]> - 1.30.0-2
267+
- add upstream patch for GCC 15
268+
https://jira.mongodb.org/browse/CDRIVER-5889
269+
262270
* Thu Feb 6 2025 Remi Collet <[email protected]> - 1.30.0-1
263271
- update to 1.30.0
264272

.evergreen/etc/spec.patch

+21-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- mongo-c-driver.spec.orig 2025-02-06 12:55:03.175912820 -0500
2-
+++ mongo-c-driver.spec 2025-02-06 12:55:26.893793221 -0500
1+
--- mongo-c-driver.spec.orig 2025-02-18 18:13:33.110137518 -0500
2+
+++ mongo-c-driver.spec 2025-02-18 18:14:32.574762199 -0500
33
@@ -10,7 +10,7 @@
44
%global gh_project mongo-c-driver
55
%global libname libmongoc
@@ -15,6 +15,24 @@
1515
Summary: Client library written in C for MongoDB
1616
-Version: %{up_version}%{?up_prever:~%{up_prever}}
1717
+Version: %{up_version}%{?up_prever}
18-
Release: 1%{?dist}
18+
Release: 2%{?dist}
1919
# See THIRD_PARTY_NOTICES
2020
License: Apache-2.0 AND ISC AND MIT AND Zlib
21+
@@ -34,8 +34,6 @@
22+
23+
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/refs/tags/%{up_version}%{?up_prever:-%{up_prever}}.tar.gz
24+
25+
-Patch0: upstream.patch
26+
-
27+
BuildRequires: cmake >= 3.15
28+
BuildRequires: gcc
29+
BuildRequires: gcc-c++
30+
@@ -130,8 +128,6 @@
31+
%prep
32+
%setup -q -n %{gh_project}-%{up_version}%{?up_prever:-%{up_prever}}
33+
34+
-%patch -P0 -p1 -b .up
35+
-
36+
37+
%build
38+
%cmake \

0 commit comments

Comments
 (0)