Compare commits

...

No commits in common. 'epel9' and 'i10ce' have entirely different histories.
epel9 ... i10ce

3
.gitignore vendored

@ -1,2 +1 @@
/gix-archive-0.4.0.crate
/gix-archive-0.6.0.crate
SOURCES/gix-archive-0.15.0.crate

@ -0,0 +1 @@
7001f789556d6eef083123ec0c345358943b9bb2 SOURCES/gix-archive-0.15.0.crate

@ -0,0 +1,44 @@
--- gix-archive-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ gix-archive-0.15.0/Cargo.toml 2024-09-07T18:05:21.490769+00:00
@@ -76,7 +76,7 @@
version = "1.0.26"
[dependencies.zip]
-version = "2.1.0"
+version = "0.6.6"
features = ["deflate"]
optional = true
default-features = false
--- gix-archive-0.15.0/src/write.rs
+++ gix-archive-0.15.0/src/write.rs
@@ -126,7 +127,7 @@ where
NextFn: FnMut(&mut Stream) -> Result<Option<Entry<'_>>, gix_worktree_stream::entry::Error>,
{
let compression_level = match opts.format {
- Format::Zip { compression_level } => compression_level.map(|lvl| lvl as i64),
+ Format::Zip { compression_level } => compression_level.map(|lvl| lvl as i32),
_other => return write_stream(stream, next_entry, out, opts),
};
@@ -149,7 +150,7 @@ where
zdt.minute().try_into().expect("non-negative"),
zdt.second().try_into().expect("non-negative"),
)
- .map_err(|err| Error::InvalidModificationTime(Box::new(err)))?;
+ .map_err(|_| Error::InvalidModificationTime(Box::new(zip::result::DateTimeRangeError)))?;
while let Some(entry) = next_entry(stream)? {
append_zip_entry(
&mut ar,
@@ -173,10 +174,10 @@ fn append_zip_entry<W: std::io::Write + std::io::Seek>(
mut entry: gix_worktree_stream::Entry<'_>,
buf: &mut Vec<u8>,
mtime: zip::DateTime,
- compression_level: Option<i64>,
+ compression_level: Option<i32>,
tree_prefix: Option<&bstr::BString>,
) -> Result<(), Error> {
- let file_opts = zip::write::FileOptions::<'_, ()>::default()
+ let file_opts = zip::write::FileOptions::default()
.compression_method(zip::CompressionMethod::Deflated)
.compression_level(compression_level)
.large_file(entry.bytes_remaining().map_or(true, |len| len > u32::MAX as usize))

@ -1,4 +1,14 @@
# Generated by rust2rpm 25
## START: Set by rpmautospec
## (rpmautospec version 0.7.2)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 1;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
# Generated by rust2rpm 26
# * Deactivate tests because of a missing dev-dependency (gix-testtools)
# * See https://github.com/Byron/gitoxide/discussions/900 for more information
%bcond_with check
@ -7,13 +17,16 @@
%global crate gix-archive
Name: rust-gix-archive
Version: 0.6.0
Version: 0.15.0
Release: %autorelease
Summary: Archive generation from of a worktree stream
License: MIT OR Apache-2.0
URL: https://crates.io/crates/gix-archive
Source: %{crates_source}
# Set zip version to 0.6 since that is the only version that is available at
# the moment
Patch: decrease-zip-version.diff
BuildRequires: cargo-rpm-macros >= 24
@ -34,7 +47,6 @@ use the "%{crate}" crate.
%files devel
%license %{crate_instdir}/LICENSE-APACHE
%license %{crate_instdir}/LICENSE-MIT
%doc %{crate_instdir}/CHANGELOG.md
# We exclude the tests directory because they contain bash scripts
# and the automatic Requires detection falsely adds bash as a required dependency.
# Tests are disabled anyway so this should have no effect.
@ -120,4 +132,31 @@ use the "zip" feature of the "%{crate}" crate.
%endif
%changelog
%autochangelog
* Fri Dec 20 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.15.0-1
- Rebuilt for MSVSphere 10
## START: Generated by rpmautospec
* Tue Sep 10 2024 blinxen <h-k-81@hotmail.com> - 0.15.0-1
- Update to version 0.15.0 (rhbz#2307375)
* Thu Jul 25 2024 blinxen <h-k-81@hotmail.com> - 0.13.2-1
- Update to version 0.13.2 (rhbz#2299561)
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sun Jul 07 2024 blinxen <h-k-81@hotmail.com> - 0.13.1-1
- Update to version 0.13.1 (rhbz#2274892)
* Fri Apr 05 2024 blinxen <h-k-81@hotmail.com> - 0.11.0-1
- Update to version 0.11.0 (rhbz#2253264)
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Oct 13 2023 blinxen <h-k-81@hotmail.com> - 0.6.0-1
- Update to version 0.6.0
* Wed Oct 04 2023 blinxen <h-k-81@hotmail.com> - 0.4.0-1
- Initial package (rhbz#2242178)
## END: Generated by rpmautospec

@ -1 +0,0 @@
SHA512 (gix-archive-0.6.0.crate) = 80a864f4a3c55902c094731bc6e0cadfe175f76981b4cb9d765e1b401a8f5631049ab3478e46a34366d798079dd4b6541d6772a95a7d0df5d068ad8de50a6aaa
Loading…
Cancel
Save