Skip to content

sync RPM spec w/ upstream #1872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 20, 2025
Merged

sync RPM spec w/ upstream #1872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .evergreen/etc/mongo-c-driver.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@
Name: mongo-c-driver
Summary: Client library written in C for MongoDB
Version: %{up_version}%{?up_prever:~%{up_prever}}
Release: 1%{?dist}
Release: 2%{?dist}
# See THIRD_PARTY_NOTICES
License: Apache-2.0 AND ISC AND MIT AND Zlib
URL: https://github.com/%{gh_owner}/%{gh_project}

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

Patch0: upstream.patch

BuildRequires: cmake >= 3.15
BuildRequires: gcc
BuildRequires: gcc-c++
Expand Down Expand Up @@ -128,6 +130,8 @@ Documentation: http://mongoc.org/libbson/%{version}/
%prep
%setup -q -n %{gh_project}-%{up_version}%{?up_prever:-%{up_prever}}

%patch -P0 -p1 -b .up


%build
%cmake \
Expand Down Expand Up @@ -259,6 +263,10 @@ exit $ret


%changelog
* Tue Feb 18 2025 Remi Collet <[email protected]> - 1.30.0-2
- add upstream patch for GCC 15
https://jira.mongodb.org/browse/CDRIVER-5889

* Thu Feb 6 2025 Remi Collet <[email protected]> - 1.30.0-1
- update to 1.30.0

Expand Down
24 changes: 21 additions & 3 deletions .evergreen/etc/spec.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- mongo-c-driver.spec.orig 2025-02-06 12:55:03.175912820 -0500
+++ mongo-c-driver.spec 2025-02-06 12:55:26.893793221 -0500
--- mongo-c-driver.spec.orig 2025-02-18 18:13:33.110137518 -0500
+++ mongo-c-driver.spec 2025-02-18 18:14:32.574762199 -0500
@@ -10,7 +10,7 @@
%global gh_project mongo-c-driver
%global libname libmongoc
Expand All @@ -15,6 +15,24 @@
Summary: Client library written in C for MongoDB
-Version: %{up_version}%{?up_prever:~%{up_prever}}
+Version: %{up_version}%{?up_prever}
Release: 1%{?dist}
Release: 2%{?dist}
# See THIRD_PARTY_NOTICES
License: Apache-2.0 AND ISC AND MIT AND Zlib
@@ -34,8 +34,6 @@

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

-Patch0: upstream.patch
-
BuildRequires: cmake >= 3.15
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -130,8 +128,6 @@
%prep
%setup -q -n %{gh_project}-%{up_version}%{?up_prever:-%{up_prever}}

-%patch -P0 -p1 -b .up
-

%build
%cmake \