Skip to content

Commit 3e94bae

Browse files
committed
update spec.patch used by rpm-package-build
1 parent de2effe commit 3e94bae

File tree

2 files changed

+7
-24
lines changed

2 files changed

+7
-24
lines changed

.evergreen/build_snapshot_rpm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ done
4141
package=mongo-c-driver
4242
spec_file=../mongo-c-driver.spec
4343
spec_url=https://src.fedoraproject.org/rpms/mongo-c-driver/raw/master/f/mongo-c-driver.spec
44-
config=${MOCK_TARGET_CONFIG:=fedora-33-x86_64}
44+
config=${MOCK_TARGET_CONFIG:=fedora-34-x86_64}
4545

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

.evergreen/spec.patch

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
--- mongo-c-driver.spec.orig 2020-08-03 17:12:45.829127475 -0400
2-
+++ mongo-c-driver.spec 2020-08-03 17:24:22.415722650 -0400
1+
--- mongo-c-driver.spec.orig 2020-11-30 10:07:51.831526659 -0500
2+
+++ mongo-c-driver.spec 2020-11-30 10:09:59.029834450 -0500
33
@@ -10,14 +10,14 @@
44
%global gh_project mongo-c-driver
55
%global libname libmongoc
66
%global libver 1.0
7-
-%global up_version 1.17.0
7+
-%global up_version 1.17.2
88
+%global up_version 1.18.0
99
#global up_prever rc0
1010
# disabled as require a MongoDB server
@@ -17,40 +17,23 @@
1717
Release: 1%{?dist}
1818
# See THIRD_PARTY_NOTICES
1919
License: ASL 2.0 and ISC and MIT and zlib
20-
@@ -25,8 +25,6 @@
21-
22-
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
23-
24-
-Patch0: %{name}-upstream.patch
25-
-
26-
BuildRequires: cmake >= 3.1
27-
BuildRequires: gcc
28-
# pkg-config may pull compat-openssl10
29-
@@ -40,7 +38,6 @@
20+
@@ -38,7 +38,6 @@
3021
BuildRequires: mongodb-server
3122
BuildRequires: openssl
3223
%endif
3324
-BuildRequires: cmake(mongocrypt)
3425
BuildRequires: perl-interpreter
3526
# From man pages
3627
BuildRequires: python3
37-
@@ -70,7 +67,6 @@
28+
@@ -68,7 +67,6 @@
3829
Requires: pkgconfig
3930
Requires: cmake-filesystem
4031
Requires: pkgconfig(libzstd)
4132
-Requires: cmake(mongocrypt)
4233

4334
%description devel
4435
This package contains the header files and development libraries
45-
@@ -107,7 +103,6 @@
46-
47-
%prep
48-
%setup -q -n %{gh_project}-%{up_version}%{?up_prever:-%{up_prever}}
49-
-%patch0 -p1
50-
51-
52-
%build
53-
@@ -130,7 +125,6 @@
36+
@@ -127,7 +125,6 @@
5437
%endif
5538
-DENABLE_EXAMPLES:BOOL=OFF \
5639
-DENABLE_UNINSTALL:BOOL=OFF \

0 commit comments

Comments
 (0)