public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-libgit2-sys0.17] epel10: compat package no longer needed
@ 2026-07-07 14:59 Fabio Valentini
  0 siblings, 0 replies; only message in thread
From: Fabio Valentini @ 2026-07-07 14:59 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-libgit2-sys0.17
Branch : epel10
Commit : f45ba703337f9db15a9509321b2e0a570086e00e
Author : Fabio Valentini <decathorpe@gmail.com>
Date   : 2026-02-16T16:38:37+01:00
Stats  : +1/-283 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-libgit2-sys0.17/c/f45ba703337f9db15a9509321b2e0a570086e00e?branch=epel10

Log:
compat package no longer needed

---
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6fdab6a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libgit2-sys-0.17.0+1.8.1.crate

diff --git a/0001-build-with-vendored-libgit2-unconditionally.patch b/0001-build-with-vendored-libgit2-unconditionally.patch
deleted file mode 100644
index 5dd2a51..0000000
--- a/0001-build-with-vendored-libgit2-unconditionally.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 16924a64fa662d649590a0a26d7f280616651435 Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Tue, 19 Sep 2023 22:02:24 +0200
-Subject: [PATCH] build with vendored libgit2 unconditionally
-
----
- build.rs | 47 -----------------------------------------------
- 1 file changed, 47 deletions(-)
-
-diff --git a/build.rs b/build.rs
-index b497005..4bf1136 100644
---- a/build.rs
-+++ b/build.rs
-@@ -4,56 +4,9 @@ use std::io;
- use std::path::{Path, PathBuf};
- use std::process::Command;
- 
--/// Tries to use system libgit2 and emits necessary build script instructions.
--fn try_system_libgit2() -> Result<pkg_config::Library, pkg_config::Error> {
--    let mut cfg = pkg_config::Config::new();
--    match cfg.range_version("1.8.1".."1.9.0").probe("libgit2") {
--        Ok(lib) => {
--            for include in &lib.include_paths {
--                println!("cargo:root={}", include.display());
--            }
--            Ok(lib)
--        }
--        Err(e) => {
--            println!("cargo:warning=failed to probe system libgit2: {e}");
--            Err(e)
--        }
--    }
--}
--
- fn main() {
-     let https = env::var("CARGO_FEATURE_HTTPS").is_ok();
-     let ssh = env::var("CARGO_FEATURE_SSH").is_ok();
--    let vendored = env::var("CARGO_FEATURE_VENDORED").is_ok();
--    let zlib_ng_compat = env::var("CARGO_FEATURE_ZLIB_NG_COMPAT").is_ok();
--
--    // Specify `LIBGIT2_NO_VENDOR` to force to use system libgit2.
--    // Due to the additive nature of Cargo features, if some crate in the
--    // dependency graph activates `vendored` feature, there is no way to revert
--    // it back. This env var serves as a workaround for this purpose.
--    println!("cargo:rerun-if-env-changed=LIBGIT2_NO_VENDOR");
--    let forced_no_vendor = env::var_os("LIBGIT2_NO_VENDOR").map_or(false, |s| s != "0");
--
--    if forced_no_vendor {
--        if try_system_libgit2().is_err() {
--            panic!(
--                "\
--The environment variable `LIBGIT2_NO_VENDOR` has been set but no compatible system libgit2 could be found.
--The build is now aborting. To disable, unset the variable or use `LIBGIT2_NO_VENDOR=0`.
--",
--            );
--        }
--
--        // We've reached here, implying we're using system libgit2.
--        return;
--    }
--
--    // To use zlib-ng in zlib-compat mode, we have to build libgit2 ourselves.
--    let try_to_use_system_libgit2 = !vendored && !zlib_ng_compat;
--    if try_to_use_system_libgit2 && try_system_libgit2().is_ok() {
--        // using system libgit2 has worked
--        return;
--    }
- 
-     println!("cargo:rustc-cfg=libgit2_vendored");
- 
--- 
-2.41.0
-

diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..3f67be8
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+compat package no longer needed

diff --git a/libgit2-sys-fix-metadata-auto.diff b/libgit2-sys-fix-metadata-auto.diff
deleted file mode 100644
index ae04ec5..0000000
--- a/libgit2-sys-fix-metadata-auto.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- libgit2-sys-0.17.0+1.8.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ libgit2-sys-0.17.0+1.8.1/Cargo.toml	2025-04-27T19:54:15.186379+00:00
-@@ -12,7 +12,7 @@
- [package]
- edition = "2018"
- name = "libgit2-sys"
--version = "0.17.0+1.8.1"
-+version = "0.17.0"
- authors = [
-     "Josh Triplett <josh@joshtriplett.org>",
-     "Alex Crichton <alex@alexcrichton.com>",
-@@ -67,3 +67,4 @@
- [target."cfg(unix)".dependencies.openssl-sys]
- version = "0.9.45"
- optional = true
-+

diff --git a/libgit2-sys-fix-metadata.diff b/libgit2-sys-fix-metadata.diff
deleted file mode 100644
index 22d4b39..0000000
--- a/libgit2-sys-fix-metadata.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- libgit2-sys-0.17.0+1.8.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ libgit2-sys-0.17.0+1.8.1/Cargo.toml	2025-04-27T19:54:15.187259+00:00
-@@ -27,7 +27,7 @@
-     "libgit2/tests/*",
- ]
- description = "Native bindings to the libgit2 library"
--license = "MIT OR Apache-2.0"
-+license = "(MIT OR Apache-2.0) AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT"
- repository = "https://github.com/rust-lang/git2-rs"
- 
- [lib]
-@@ -58,11 +58,6 @@
- ssh = ["libssh2-sys"]
- ssh_key_from_memory = []
- vendored = []
--vendored-openssl = ["openssl-sys/vendored"]
--zlib-ng-compat = [
--    "libz-sys/zlib-ng",
--    "libssh2-sys?/zlib-ng-compat",
--]
- 
- [target."cfg(unix)".dependencies.openssl-sys]
- version = "0.9.45"

diff --git a/rust-libgit2-sys0.17.spec b/rust-libgit2-sys0.17.spec
deleted file mode 100644
index 4eeff62..0000000
--- a/rust-libgit2-sys0.17.spec
+++ /dev/null
@@ -1,169 +0,0 @@
-# Generated by rust2rpm 27
-%bcond check 1
-%global debug_package %{nil}
-
-%global crate libgit2-sys
-%global crate_version 0.17.0+1.8.1
-
-Name:           rust-libgit2-sys0.17
-Version:        0.17.0
-Release:        %autorelease
-Summary:        Native bindings to the libgit2 library
-
-# * libgit2-sys crate:      MIT OR Apache-2.0
-# * bundled libgit2:        GPL-2.0-only WITH GCC-exception-2.0
-# * bundled llhttp:         MIT
-# * bundled pcre:           BSD-3-Clause
-License:        (MIT OR Apache-2.0) AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT
-URL:            https://crates.io/crates/libgit2-sys
-Source:         %{crates_source %{crate} %{crate_version}}
-# Automatically generated patch to strip dependencies and normalize metadata
-Patch:          libgit2-sys-fix-metadata-auto.diff
-# Manually created patch for downstream crate metadata changes
-# * update package.license field to reflect bundled dependencies
-# * drop features for statically linking against vendored OpenSSL
-Patch:          libgit2-sys-fix-metadata.diff
-# * build against the bundled copy of libgit2 unconditionally:
-#   the version in the Fedora repositories is always either too old or too new
-Patch:          0001-build-with-vendored-libgit2-unconditionally.patch
-
-BuildRequires:  cargo-rpm-macros >= 24
-
-%global _description %{expand:
-Native bindings to the libgit2 library.}
-
-%description %{_description}
-
-%package        devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-Provides:       bundled(libgit2) = 1.8.1
-Provides:       bundled(llhttp) = 9.2.1
-Provides:       bundled(pcre) = 8.45
-
-%description    devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files          devel
-%license %{crate_instdir}/LICENSE-APACHE
-%license %{crate_instdir}/LICENSE-MIT
-%license %{crate_instdir}/libgit2/COPYING
-%license %{crate_instdir}/libgit2/deps/llhttp/LICENSE-MIT
-%license %{crate_instdir}/libgit2/deps/pcre/LICENCE
-%doc %{crate_instdir}/CHANGELOG.md
-%{crate_instdir}/
-
-%package     -n %{name}+default-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files       -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+https-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+https-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "https" feature of the "%{crate}" crate.
-
-%files       -n %{name}+https-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+libssh2-sys-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+libssh2-sys-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "libssh2-sys" feature of the "%{crate}" crate.
-
-%files       -n %{name}+libssh2-sys-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+openssl-sys-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+openssl-sys-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "openssl-sys" feature of the "%{crate}" crate.
-
-%files       -n %{name}+openssl-sys-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+ssh-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+ssh-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "ssh" feature of the "%{crate}" crate.
-
-%files       -n %{name}+ssh-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+ssh_key_from_memory-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+ssh_key_from_memory-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "ssh_key_from_memory" feature of the "%{crate}" crate.
-
-%files       -n %{name}+ssh_key_from_memory-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+vendored-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+vendored-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "vendored" feature of the "%{crate}" crate.
-
-%files       -n %{name}+vendored-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{crate_version} -p1
-# remove upstream development scripts from libgit2
-rm -r libgit2/script/
-# remove unused bundled dependencies
-rm -r libgit2/deps/chromium-zlib
-rm -r libgit2/deps/ntlmclient
-rm -r libgit2/deps/winhttp
-rm -r libgit2/deps/zlib
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog

diff --git a/sources b/sources
deleted file mode 100644
index f3f47b1..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (libgit2-sys-0.17.0+1.8.1.crate) = 4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-07 14:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-07 14:59 [rpms/rust-libgit2-sys0.17] epel10: compat package no longer needed Fabio Valentini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox