Skip to content

Commit f354fde

Browse files
authored
sync RPM spec file from downstream (r1.27) (#1609)
* sync RPM spec file from downstream * use F40 for RPM build
1 parent 2afdebb commit f354fde

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,20 @@
1010
%global gh_project mongo-c-driver
1111
%global libname libmongoc
1212
%global libver 1.0
13-
%global up_version 1.26.2
13+
%global up_version 1.27.1
1414
#global up_prever rc0
1515
# disabled as require a MongoDB server
1616
%bcond_with tests
1717

1818
# disable for bootstrap (libmongocrypt needs libbson)
1919
%bcond_without libmongocrypt
2020

21+
%if 0%{?rhel} == 8
22+
%bcond_with libutf8proc
23+
%else
24+
%bcond_without libutf8proc
25+
%endif
26+
2127
Name: mongo-c-driver
2228
Summary: Client library written in C for MongoDB
2329
Version: %{up_version}%{?up_prever:~%{up_prever}}
@@ -37,15 +43,17 @@ BuildRequires: openssl-devel
3743
BuildRequires: pkgconfig(libsasl2)
3844
BuildRequires: pkgconfig(zlib)
3945
BuildRequires: pkgconfig(snappy)
46+
%if %{with libutf8proc}
4047
BuildRequires: pkgconfig(libutf8proc)
48+
%endif
4149
BuildRequires: pkgconfig(libzstd) >= 0.8.0
4250
%if %{with tests}
4351
BuildRequires: mongodb-server
4452
BuildRequires: openssl
4553
%endif
4654
%if %{with libmongocrypt}
4755
# grep VERSION_LESS src/*/CMakeLists.txt
48-
BuildRequires: cmake(mongocrypt) >= 1.8.0
56+
BuildRequires: cmake(mongocrypt) >= 1.10.0
4957
%endif
5058
BuildRequires: perl-interpreter
5159
# From man pages
@@ -65,6 +73,10 @@ Provides: %{name}-tools%{?_isa} = %{version}
6573

6674
%package libs
6775
Summary: Shared libraries for %{name}
76+
%if %{without libutf8proc}
77+
Provides: bundled(libutf8proc) = 2.8.0
78+
%endif
79+
Provides: bundled(uthash) = 2.3.0
6880

6981
%description libs
7082
This package contains the shared libraries for %{name}.
@@ -146,7 +158,11 @@ Documentation: http://mongoc.org/libbson/%{version}/
146158
-DENABLE_CLIENT_SIDE_ENCRYPTION:BOOL=OFF \
147159
%endif
148160
-DCMAKE_SKIP_RPATH:BOOL=ON \
161+
%if %{with libutf8proc}
149162
-DUSE_BUNDLED_UTF8PROC:BOOL=OFF \
163+
%else
164+
-DUSE_BUNDLED_UTF8PROC:BOOL=ON \
165+
%endif
150166
-DENABLE_SRV:BOOL=ON \
151167
-DENABLE_MONGODB_AWS_AUTH:STRING=ON \
152168
-S .
@@ -243,6 +259,13 @@ exit $ret
243259

244260

245261
%changelog
262+
* Mon May 13 2024 Remi Collet <[email protected]> - 1.27.1-1
263+
- update to 1.27.1
264+
265+
* Thu May 2 2024 Remi Collet <[email protected]> - 1.27.0-1
266+
- update to 1.27.0
267+
- raise dependency to libmongocrypt 1.10.0
268+
246269
* Wed Apr 3 2024 Remi Collet <[email protected]> - 1.26.2-1
247270
- update to 1.26.2
248271

.evergreen/etc/spec.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
%global gh_project mongo-c-driver
55
%global libname libmongoc
66
%global libver 1.0
7-
-%global up_version 1.26.2
8-
+%global up_version 1.27.0
7+
-%global up_version 1.27.1
8+
+%global up_version 1.27.2
99
#global up_prever rc0
1010
# disabled as require a MongoDB server
1111
%bcond_with tests

.evergreen/scripts/build_snapshot_rpm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ done
3939

4040
package=mongo-c-driver
4141
spec_file=../mongo-c-driver.spec
42-
config=${MOCK_TARGET_CONFIG:=fedora-38-aarch64}
42+
config=${MOCK_TARGET_CONFIG:=fedora-40-aarch64}
4343

4444
if [ ! -x /usr/bin/rpmbuild -o ! -x /usr/bin/rpmspec ]; then
4545
echo "Missing the rpmbuild or rpmspec utility from the rpm-build package"

0 commit comments

Comments
 (0)