Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
| fa6ff50028 |
6 changed files with 226 additions and 1 deletions
6
.gitignore
vendored
Normal file
6
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
/zola-0.8.0.tar.gz
|
||||
/zola-0.9.0.tar.gz
|
||||
/zola-0.10.0.tar.gz
|
||||
/zola-0.10.1.tar.gz
|
||||
/zola-0.11.0.tar.gz
|
||||
/zola-0.12.2.tar.gz
|
||||
41
0001-bump-mockito-and-use-native-tls-by-default.patch
Normal file
41
0001-bump-mockito-and-use-native-tls-by-default.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
From 793e7e551e8799511edfb86052fb98794adb12aa Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Wed, 1 Sep 2021 15:41:47 +0200
|
||||
Subject: [PATCH] bump mockito and use native-tls by default
|
||||
|
||||
---
|
||||
components/link_checker/Cargo.toml | 4 ++--
|
||||
components/templates/Cargo.toml | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/components/link_checker/Cargo.toml b/components/link_checker/Cargo.toml
|
||||
index c050ad4..b56d2f8 100644
|
||||
--- a/components/link_checker/Cargo.toml
|
||||
+++ b/components/link_checker/Cargo.toml
|
||||
@@ -13,7 +13,7 @@ errors = { path = "../errors" }
|
||||
[dependencies.reqwest]
|
||||
version = "0.10"
|
||||
default-features = false
|
||||
-features = ["blocking", "rustls-tls"]
|
||||
+features = ["blocking", "default-tls"]
|
||||
|
||||
[dev-dependencies]
|
||||
-mockito = "0.27"
|
||||
+mockito = "0.30"
|
||||
diff --git a/components/templates/Cargo.toml b/components/templates/Cargo.toml
|
||||
index a5e25f2..ba77e6f 100644
|
||||
--- a/components/templates/Cargo.toml
|
||||
+++ b/components/templates/Cargo.toml
|
||||
@@ -26,7 +26,7 @@ svg_metadata = "0.4.1"
|
||||
[dependencies.reqwest]
|
||||
version = "0.10"
|
||||
default-features = false
|
||||
-features = ["blocking", "rustls-tls"]
|
||||
+features = ["blocking", "default-tls"]
|
||||
|
||||
[dev-dependencies]
|
||||
-mockito = "0.27"
|
||||
+mockito = "0.30"
|
||||
--
|
||||
2.31.1
|
||||
|
||||
3
README.md
Normal file
3
README.md
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
# zola
|
||||
|
||||
The zola package
|
||||
|
|
@ -1 +0,0 @@
|
|||
unmaintained and outdated
|
||||
1
sources
Normal file
1
sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
SHA512 (zola-0.12.2.tar.gz) = a3bb698236d4d2f381508a47dfe4fb98faf8caacc2cbd2f19e2c87de1bb0824aeaa4d633e4a2800a4ee5149a3f575a94de4a65e28b6cb75172a6ee988a9b44b2
|
||||
175
zola.spec
Normal file
175
zola.spec
Normal file
|
|
@ -0,0 +1,175 @@
|
|||
# Generated by rust2rpm 13 + a lot of manual work
|
||||
%bcond_without check
|
||||
%global __cargo_skip_build 0
|
||||
|
||||
Name: zola
|
||||
Version: 0.12.2
|
||||
Release: 11%{?dist}
|
||||
Summary: Fast static site generator with everything built-in
|
||||
|
||||
# Upstream license specification: MIT
|
||||
# (MIT or ASL 2.0) and Public Domain
|
||||
# 0BSD or MIT or ASL 2.0
|
||||
# ASL 2.0
|
||||
# ASL 2.0 or Boost
|
||||
# ASL 2.0 or MIT
|
||||
# BSD
|
||||
# CC0
|
||||
# ISC
|
||||
# MIT
|
||||
# MIT or ASL 2.0
|
||||
# MIT or ASL 2.0 or zlib
|
||||
# MIT or BSD
|
||||
# MIT or zlib or ASL 2.0
|
||||
# Unlicense or MIT
|
||||
# zlib
|
||||
# zlib or ASL 2.0 or MIT
|
||||
License: MIT and ASL 2.0 and BSD and CC0 and ISC and MIT and Public Domain and zlib
|
||||
URL: https://www.getzola.org/
|
||||
Source: https://github.com/getzola/zola/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# * bump mockito dev-dependency from 0.27 to 0.30:
|
||||
# https://github.com/getzola/zola/commit/9228260
|
||||
# https://github.com/getzola/zola/commit/8e6c3f4
|
||||
# https://github.com/getzola/zola/commit/e92e4f1
|
||||
# * use default native-tls backend of reqwest instead of rustls:
|
||||
# rustls is not available on all supported architectures
|
||||
Patch1: 0001-bump-mockito-and-use-native-tls-by-default.patch
|
||||
|
||||
ExclusiveArch: %{rust_arches}
|
||||
|
||||
BuildRequires: rust-packaging
|
||||
|
||||
# src/cmd/livereload.js
|
||||
Provides: bundled(js-livereload-js) = 3.2.4
|
||||
# components/search/src/elasticlunr.min.js
|
||||
Provides: bundled(js-elasticlunr-js) = 0.9.5
|
||||
|
||||
%description
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1723064
|
||||
%if 0%{?__isa_bits} == 32
|
||||
sed -i -e '/lto/d' Cargo.toml
|
||||
%endif
|
||||
%cargo_prep
|
||||
|
||||
%generate_buildrequires
|
||||
# HACK
|
||||
for f in Cargo.toml components/*/Cargo.toml; do
|
||||
cd $(dirname $f)
|
||||
sed -i.br -r -e '/=\s*\{[^}]+path\s*=/d' Cargo.toml
|
||||
%cargo_generate_buildrequires
|
||||
mv -f Cargo.toml{.br,}
|
||||
cd - >/dev/null
|
||||
done
|
||||
|
||||
%build
|
||||
%cargo_build
|
||||
|
||||
%install
|
||||
%cargo_install
|
||||
install -Dpm0644 -t %{buildroot}%{_datadir}/bash-completion/completions \
|
||||
completions/zola.bash
|
||||
install -Dpm0644 -t %{buildroot}%{_datadir}/fish/vendor_completions.d \
|
||||
completions/zola.fish
|
||||
install -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions \
|
||||
completions/_zola
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
%cargo_test
|
||||
%endif
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md CHANGELOG.md
|
||||
%{_bindir}/zola
|
||||
%dir %{_datadir}/bash-completion
|
||||
%dir %{_datadir}/bash-completion/completions
|
||||
%{_datadir}/bash-completion/completions/zola.bash
|
||||
%dir %{_datadir}/fish
|
||||
%dir %{_datadir}/fish/vendor_completions.d
|
||||
%{_datadir}/fish/vendor_completions.d/zola.fish
|
||||
%dir %{_datadir}/zsh
|
||||
%dir %{_datadir}/zsh/site-functions
|
||||
%{_datadir}/zsh/site-functions/_zola
|
||||
|
||||
%changelog
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Tue Jan 25 2022 Fabio Valentini <decathorpe@gmail.com> - 0.12.2-10
|
||||
- Rebuild with thread_local 1.1.4 for RUSTSEC-2022-0006.
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 0.12.2-8
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Wed Sep 01 2021 Fabio Valentini <decathorpe@gmail.com> - 0.12.2-7
|
||||
- Use patches instead of sed for patching cargo metadata, restoring TLS functionality.
|
||||
|
||||
* Sat Aug 07 2021 Fabio Valentini <decathorpe@gmail.com> - 0.12.2-6
|
||||
- Rebuild with crossbeam-deque 0.8.1 / 0.7.4 for CVE-2021-32810
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri May 21 2021 Fabio Valentini <decathorpe@gmail.com> - 0.12.2-4
|
||||
- Bump mockito from 0.28 to 0.30.
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Dec 28 13:34:37 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.12.2-2
|
||||
- Rebuild
|
||||
|
||||
* Mon Sep 28 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.12.2-1
|
||||
- Update to 0.12.2
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-3
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed May 27 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.11.0-1
|
||||
- Update to 0.11.0
|
||||
|
||||
* Fri May 08 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.10.1-1
|
||||
- Update to 0.10.1
|
||||
|
||||
* Wed Apr 22 2020 Josh Stone <jistone@redhat.com> - 0.10.0-2
|
||||
- Bump to syntect 4
|
||||
|
||||
* Mon Feb 17 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.10.0-1
|
||||
- Update to 0.10.0
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Dec 12 10:45:44 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.0-1
|
||||
- Update to 0.9.0
|
||||
|
||||
* Fri Sep 13 19:18:54 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.8.0-5
|
||||
- Bump ammonia to 3.0.0
|
||||
- Bump pulldown-cmark to 0.6
|
||||
- Bump image to 0.22
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Jul 21 18:29:00 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.8.0-3
|
||||
- Correct fish completions directory
|
||||
|
||||
* Mon Jun 24 13:09:35 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.8.0-2
|
||||
- Update toml to 0.5
|
||||
- Bring 32bit packages back, but without LTO
|
||||
|
||||
* Sat Jun 22 14:24:19 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.8.0-1
|
||||
- Initial package
|
||||
Loading…
Add table
Add a link
Reference in a new issue