From b323553c25dc13492d6fe2ea44cd5e4b552d9503 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 29 Dec 2020 20:01:25 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/rust.git#35653afd8f61bbb66e6dc14ca866179c4c336e82
---
 rust.spec | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/rust.spec b/rust.spec
index 3d078a2..176a75f 100644
--- a/rust.spec
+++ b/rust.spec
@@ -53,7 +53,7 @@
 
 Name:           rust
 Version:        1.48.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -157,7 +157,7 @@ BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(libgit2) >= 1.0.0
 %endif
 
-%if %{without disabled_libssh2} && %{without bundled_libssh2}
+%if %{without disabled_libssh2}
 # needs libssh2_userauth_publickey_frommemory
 BuildRequires:  pkgconfig(libssh2) >= 1.6.0
 %endif
@@ -299,9 +299,6 @@ Summary:        Rust's package manager and build tool
 %if %with bundled_libgit2
 Provides:       bundled(libgit2) = 1.1.0
 %endif
-%if %with bundled_libssh2
-Provides:       bundled(libssh2) = 1.9.0~dev
-%endif
 # For tests:
 BuildRequires:  git
 # Cargo is not much use without Rust
@@ -345,9 +342,6 @@ Summary:        Rust Language Server for IDE integration
 %if %with bundled_libgit2
 Provides:       bundled(libgit2) = 1.1.0
 %endif
-%if %with bundled_libssh2
-Provides:       bundled(libssh2) = 1.9.0~dev
-%endif
 Requires:       rust-analysis
 # /usr/bin/rls is dynamically linked against internal rustc libs
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -437,6 +431,7 @@ mkdir -p src/llvm-project/libunwind/
 # Remove other unused vendored libraries
 rm -rf vendor/curl-sys/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
+rm -rf vendor/libssh2-sys/libssh2/
 rm -rf vendor/libz-sys/src/zlib/
 rm -rf vendor/libz-sys/src/zlib-ng/
 rm -rf vendor/lzma-sys/xz-*/
@@ -446,9 +441,6 @@ rm -rf vendor/openssl-src/openssl/
 rm -rf vendor/libgit2-sys/libgit2/
 %endif
 
-%if %without bundled_libssh2
-rm -rf vendor/libssh2-sys/libssh2/
-%endif
 %if %with disabled_libssh2
 rm -rf vendor/libssh2-sys/
 %endif
@@ -488,7 +480,7 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
 # convince libgit2-sys to use the distro libgit2
 %global rust_env %{rust_env} LIBGIT2_SYS_USE_PKG_CONFIG=1
 %endif
-%if %without bundled_libssh2
+%if %without disabled_libssh2
 # convince libssh2-sys to use the distro libssh2
 %global rust_env %{rust_env} LIBSSH2_SYS_USE_PKG_CONFIG=1
 %endif
@@ -737,6 +729,12 @@ export %{rust_env}
 
 
 %changelog
+* Tue Dec 29 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-3
+- De-bootstrap
+
+* Mon Dec 28 19:00:26 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-2
+- Rebuild for libgit2 1.1.x
+
 * Thu Nov 19 2020 Josh Stone <jistone@redhat.com> - 1.48.0-1
 - Update to 1.48.0.