Skip to content

Commit 87b9a79

Browse files
committed
sync RPM spec file from downstream
1 parent 13b1ef2 commit 87b9a79

File tree

2 files changed

+39
-24
lines changed

2 files changed

+39
-24
lines changed

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

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
%global gh_project mongo-c-driver
1111
%global libname libmongoc
1212
%global libver 1.0
13-
%global up_version 1.24.1
13+
%global up_version 1.25.1
1414
#global up_prever rc0
1515
# disabled as require a MongoDB server
1616
%bcond_with tests
@@ -26,7 +26,7 @@ Release: 1%{?dist}
2626
License: Apache-2.0 AND ISC AND MIT AND Zlib
2727
URL: https://github.com/%{gh_owner}/%{gh_project}
2828

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

3131
BuildRequires: cmake >= 3.15
3232
BuildRequires: gcc
@@ -37,7 +37,7 @@ BuildRequires: openssl-devel
3737
BuildRequires: pkgconfig(libsasl2)
3838
BuildRequires: pkgconfig(zlib)
3939
BuildRequires: pkgconfig(snappy)
40-
BuildRequires: pkgconfig(icu-uc)
40+
BuildRequires: pkgconfig(libutf8proc)
4141
BuildRequires: pkgconfig(libzstd)
4242
%if %{with tests}
4343
BuildRequires: mongodb-server
@@ -49,7 +49,8 @@ BuildRequires: cmake(mongocrypt) >= 1.5.2
4949
BuildRequires: perl-interpreter
5050
# From man pages
5151
BuildRequires: python3
52-
BuildRequires: /usr/bin/sphinx-build
52+
BuildRequires: python3-sphinx
53+
BuildRequires: python3-sphinx-design
5354

5455
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
5556
# Sub package removed
@@ -118,15 +119,16 @@ Documentation: http://mongoc.org/libbson/%{version}/
118119

119120
%build
120121
%cmake \
122+
-DBUILD_VERSION=%{up_version}%{?up_prever:-%{up_prever}} \
121123
-DENABLE_MONGOC:BOOL=ON \
122124
-DENABLE_SHM_COUNTERS:BOOL=ON \
123125
-DENABLE_SSL:STRING=OPENSSL \
124126
-DENABLE_SASL:STRING=CYRUS \
125127
-DENABLE_MONGODB_AWS_AUTH:STRING=ON \
126-
-DENABLE_ICU:STRING=ON \
127128
-DENABLE_AUTOMATIC_INIT_AND_CLEANUP:BOOL=OFF \
128129
-DENABLE_CRYPTO_SYSTEM_PROFILE:BOOL=ON \
129130
-DENABLE_MAN_PAGES:BOOL=ON \
131+
-DENABLE_SHARED:BOOL=ON \
130132
-DENABLE_STATIC:STRING=OFF \
131133
-DENABLE_ZLIB:STRING=SYSTEM \
132134
-DENABLE_ZSTD:STRING=ON \
@@ -144,6 +146,9 @@ Documentation: http://mongoc.org/libbson/%{version}/
144146
-DENABLE_CLIENT_SIDE_ENCRYPTION:BOOL=OFF \
145147
%endif
146148
-DCMAKE_SKIP_RPATH:BOOL=ON \
149+
-DUSE_BUNDLED_UTF8PROC:BOOL=OFF \
150+
-DENABLE_SRV:BOOL=ON \
151+
-DENABLE_MONGODB_AWS_AUTH:STRING=ON \
147152
-S .
148153

149154
%if 0%{?cmake_build:1}
@@ -238,6 +243,33 @@ exit $ret
238243

239244

240245
%changelog
246+
* Wed Nov 8 2023 Remi Collet <[email protected]> - 1.25.1-1
247+
- update to 1.25.1
248+
249+
* Mon Nov 6 2023 Remi Collet <[email protected]> - 1.25.0-1
250+
- update to 1.25.0
251+
- drop dependency on libicu
252+
- add dependency on libutf8proc
253+
- open https://jira.mongodb.org/browse/CDRIVER-4767 unusable archive
254+
255+
* Wed Sep 6 2023 Remi Collet <[email protected]> - 1.24.4-1
256+
- update to 1.24.4 (no change)
257+
258+
* Thu Aug 17 2023 Remi Collet <[email protected]> - 1.24.3-1
259+
- update to 1.24.3
260+
261+
* Thu Jul 20 2023 Fedora Release Engineering <[email protected]> - 1.24.2-3
262+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
263+
264+
* Thu Jul 13 2023 František Zatloukal <[email protected]> - 1.24.2-2
265+
- Rebuilt for ICU 73.2
266+
267+
* Thu Jul 13 2023 Remi Collet <[email protected]> - 1.24.2-1
268+
- update to 1.24.2
269+
270+
* Tue Jul 11 2023 František Zatloukal <[email protected]> - 1.24.1-2
271+
- Rebuilt for ICU 73.2
272+
241273
* Wed Jun 21 2023 Remi Collet <[email protected]> - 1.24.1-1
242274
- update to 1.24.1
243275

.evergreen/etc/spec.patch

Lines changed: 2 additions & 19 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.24.1
8-
+%global up_version 1.25.0
7+
-%global up_version 1.25.1
8+
+%global up_version 1.26.0
99
#global up_prever rc0
1010
# disabled as require a MongoDB server
1111
%bcond_with tests
@@ -18,20 +18,3 @@
1818
Release: 1%{?dist}
1919
# See THIRD_PARTY_NOTICES
2020
License: Apache-2.0 AND ISC AND MIT AND Zlib
21-
@@ -37,7 +37,7 @@ BuildRequires: openssl-devel
22-
BuildRequires: pkgconfig(libsasl2)
23-
BuildRequires: pkgconfig(zlib)
24-
BuildRequires: pkgconfig(snappy)
25-
-BuildRequires: pkgconfig(icu-uc)
26-
BuildRequires: pkgconfig(libzstd)
27-
+BuildRequires: python-sphinx-design
28-
%if %{with tests}
29-
BuildRequires: mongodb-server
30-
@@ -123,7 +122,6 @@ Documentation: http://mongoc.org/libbson/%{version}/
31-
-DENABLE_SSL:STRING=OPENSSL \
32-
-DENABLE_SASL:STRING=CYRUS \
33-
-DENABLE_MONGODB_AWS_AUTH:STRING=ON \
34-
- -DENABLE_ICU:STRING=ON \
35-
-DENABLE_AUTOMATIC_INIT_AND_CLEANUP:BOOL=OFF \
36-
-DENABLE_CRYPTO_SYSTEM_PROFILE:BOOL=ON \
37-
-DENABLE_MAN_PAGES:BOOL=ON \

0 commit comments

Comments
 (0)