The package rpms/zola.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/zola.git/commit/?id=40adc5e3b791f....
Change:
-%ifarch %{ix86} armv7hl
Thanks.
Full change:
============
commit 40adc5e3b791fe19eb19db36d7984d0eec28e0cb
Author: Igor Raits <ignatenkobrain(a)fedoraproject.org>
Date: Mon Feb 17 10:36:46 2020 +0100
Update to 0.10.0
Signed-off-by: Igor Raits <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index 663f44d..6951ee2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/zola-0.8.0.tar.gz
/zola-0.9.0.tar.gz
+/zola-0.10.0.tar.gz
diff --git a/0001-Update-Tera.patch b/0001-Update-Tera.patch
deleted file mode 100644
index 12fcd99..0000000
--- a/0001-Update-Tera.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From d61e3dd16f4172a5f361e44685c309d839de7f06 Mon Sep 17 00:00:00 2001
-From: Vincent Prouillet <balthek(a)gmail.com>
-Date: Sat, 7 Dec 2019 17:50:51 +0100
-Subject: [PATCH] Update Tera
-
----
- components/errors/Cargo.toml | 2 +-
- components/front_matter/Cargo.toml | 2 +-
- components/imageproc/Cargo.toml | 2 +-
- components/library/Cargo.toml | 2 +-
- components/rendering/Cargo.toml | 2 +-
- components/site/Cargo.toml | 2 +-
- components/templates/Cargo.toml | 2 +-
- components/utils/Cargo.toml | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/components/errors/Cargo.toml b/components/errors/Cargo.toml
-index 93939e6..436add0 100644
---- a/components/errors/Cargo.toml
-+++ b/components/errors/Cargo.toml
-@@ -4,7 +4,7 @@ version = "0.1.0"
- authors = ["Vincent Prouillet <prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
--tera = "1.0.0-beta.17"
-+tera = "1"
- toml = "0.5"
- image = "0.22"
- syntect = "=3.2.0"
-diff --git a/components/front_matter/Cargo.toml b/components/front_matter/Cargo.toml
-index d023571..82df099 100644
---- a/components/front_matter/Cargo.toml
-+++ b/components/front_matter/Cargo.toml
-@@ -4,7 +4,7 @@ version = "0.1.0"
- authors = ["Vincent Prouillet <prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
--tera = "1.0.0-beta.17"
-+tera = "1"
- chrono = "0.4"
- serde = "1"
- serde_derive = "1"
-diff --git a/components/imageproc/Cargo.toml b/components/imageproc/Cargo.toml
-index 5c36637..1d7f98b 100644
---- a/components/imageproc/Cargo.toml
-+++ b/components/imageproc/Cargo.toml
-@@ -6,7 +6,7 @@ authors = ["Vojtch Krl <vojtech(a)kral.hk>"]
- [dependencies]
- lazy_static = "1"
- regex = "1.0"
--tera = "1.0.0-beta.17"
-+tera = "1"
- image = "0.22"
- rayon = "1"
-
-diff --git a/components/library/Cargo.toml b/components/library/Cargo.toml
-index eb6f10e..cc26d5c 100644
---- a/components/library/Cargo.toml
-+++ b/components/library/Cargo.toml
-@@ -7,7 +7,7 @@ authors = ["Vincent Prouillet
<prouillet.vincent(a)gmail.com>"]
- slotmap = "0.4"
- rayon = "1"
- chrono = { version = "0.4", features = ["serde"] }
--tera = "1.0.0-beta.17"
-+tera = "1"
- serde = "1"
- serde_derive = "1"
- slug = "0.1"
-diff --git a/components/rendering/Cargo.toml b/components/rendering/Cargo.toml
-index 6fe54d5..f9efd4a 100644
---- a/components/rendering/Cargo.toml
-+++ b/components/rendering/Cargo.toml
-@@ -4,7 +4,7 @@ version = "0.1.0"
- authors = ["Vincent Prouillet <prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
--tera = { version = "1.0.0-beta.10", features = ["preserve_order"] }
-+tera = { version = "1", features = ["preserve_order"] }
- syntect = "=3.2.0"
- pulldown-cmark = "0.6"
- slug = "0.1"
-diff --git a/components/site/Cargo.toml b/components/site/Cargo.toml
-index f01f2e9..61062c2 100644
---- a/components/site/Cargo.toml
-+++ b/components/site/Cargo.toml
-@@ -4,7 +4,7 @@ version = "0.1.0"
- authors = ["Vincent Prouillet <prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
--tera = "1.0.0-beta.17"
-+tera = "1"
- glob = "0.3"
- rayon = "1"
- serde = "1"
-diff --git a/components/templates/Cargo.toml b/components/templates/Cargo.toml
-index 0ef3f49..488383d 100644
---- a/components/templates/Cargo.toml
-+++ b/components/templates/Cargo.toml
-@@ -4,7 +4,7 @@ version = "0.1.0"
- authors = ["Vincent Prouillet <prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
--tera = "1.0.0-beta.17"
-+tera = "1"
- base64 = "0.11"
- lazy_static = "1"
- pulldown-cmark = "0.6"
-diff --git a/components/utils/Cargo.toml b/components/utils/Cargo.toml
-index 1db8d69..9f8dd13 100644
---- a/components/utils/Cargo.toml
-+++ b/components/utils/Cargo.toml
-@@ -5,7 +5,7 @@ authors = ["Vincent Prouillet
<prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
- errors = { path = "../errors" }
--tera = "1.0.0-beta.17"
-+tera = "1"
- unicode-segmentation = "1.2"
- walkdir = "2"
- toml = "0.5"
---
-2.24.1
-
diff --git a/0001-Update-base64.patch b/0001-Update-base64.patch
deleted file mode 100644
index 3803e03..0000000
--- a/0001-Update-base64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0cd047bde036c64fa98a6cbcd75507f976ebff7a Mon Sep 17 00:00:00 2001
-From: Vincent Prouillet <balthek(a)gmail.com>
-Date: Mon, 28 Oct 2019 12:51:22 +0000
-Subject: [PATCH] Update base64
-
----
- components/templates/Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/components/templates/Cargo.toml b/components/templates/Cargo.toml
-index e040ded..0ef3f49 100644
---- a/components/templates/Cargo.toml
-+++ b/components/templates/Cargo.toml
-@@ -5,7 +5,7 @@ authors = ["Vincent Prouillet
<prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
- tera = "1.0.0-beta.17"
--base64 = "0.10"
-+base64 = "0.11"
- lazy_static = "1"
- pulldown-cmark = "0.6"
- toml = "0.5"
---
-2.24.1
-
diff --git a/0001-Update-tera.patch b/0001-Update-tera.patch
deleted file mode 100644
index 2603a57..0000000
--- a/0001-Update-tera.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 82ac173efefcfd1e1046fe6e064cdad29160992c Mon Sep 17 00:00:00 2001
-From: Vincent Prouillet <balthek(a)gmail.com>
-Date: Sun, 20 Oct 2019 19:08:01 +0100
-Subject: [PATCH] Update tera
-
----
- components/errors/Cargo.toml | 2 +-
- components/front_matter/Cargo.toml | 2 +-
- components/imageproc/Cargo.toml | 2 +-
- components/library/Cargo.toml | 2 +-
- components/site/Cargo.toml | 2 +-
- components/templates/Cargo.toml | 2 +-
- components/templates/src/lib.rs | 2 +-
- components/utils/Cargo.toml | 2 +-
- components/utils/src/templates.rs | 8 ++++----
- 9 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/components/errors/Cargo.toml b/components/errors/Cargo.toml
-index 21d957d..93939e6 100644
---- a/components/errors/Cargo.toml
-+++ b/components/errors/Cargo.toml
-@@ -4,7 +4,7 @@ version = "0.1.0"
- authors = ["Vincent Prouillet <prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
--tera = "1.0.0-beta.10"
-+tera = "1.0.0-beta.17"
- toml = "0.5"
- image = "0.22"
- syntect = "=3.2.0"
-diff --git a/components/front_matter/Cargo.toml b/components/front_matter/Cargo.toml
-index ab53ad4..d023571 100644
---- a/components/front_matter/Cargo.toml
-+++ b/components/front_matter/Cargo.toml
-@@ -4,7 +4,7 @@ version = "0.1.0"
- authors = ["Vincent Prouillet <prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
--tera = "1.0.0-beta.10"
-+tera = "1.0.0-beta.17"
- chrono = "0.4"
- serde = "1"
- serde_derive = "1"
-diff --git a/components/imageproc/Cargo.toml b/components/imageproc/Cargo.toml
-index df9b4b1..5c36637 100644
---- a/components/imageproc/Cargo.toml
-+++ b/components/imageproc/Cargo.toml
-@@ -6,7 +6,7 @@ authors = ["Vojtch Krl <vojtech(a)kral.hk>"]
- [dependencies]
- lazy_static = "1"
- regex = "1.0"
--tera = "1.0.0-beta.10"
-+tera = "1.0.0-beta.17"
- image = "0.22"
- rayon = "1"
-
-diff --git a/components/library/Cargo.toml b/components/library/Cargo.toml
-index b2923bf..eb6f10e 100644
---- a/components/library/Cargo.toml
-+++ b/components/library/Cargo.toml
-@@ -7,7 +7,7 @@ authors = ["Vincent Prouillet
<prouillet.vincent(a)gmail.com>"]
- slotmap = "0.4"
- rayon = "1"
- chrono = { version = "0.4", features = ["serde"] }
--tera = "1.0.0-beta.10"
-+tera = "1.0.0-beta.17"
- serde = "1"
- serde_derive = "1"
- slug = "0.1"
-diff --git a/components/site/Cargo.toml b/components/site/Cargo.toml
-index 54d9494..f01f2e9 100644
---- a/components/site/Cargo.toml
-+++ b/components/site/Cargo.toml
-@@ -4,7 +4,7 @@ version = "0.1.0"
- authors = ["Vincent Prouillet <prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
--tera = "1.0.0-beta.10"
-+tera = "1.0.0-beta.17"
- glob = "0.3"
- rayon = "1"
- serde = "1"
-diff --git a/components/templates/Cargo.toml b/components/templates/Cargo.toml
-index 7e8a4c9..e040ded 100644
---- a/components/templates/Cargo.toml
-+++ b/components/templates/Cargo.toml
-@@ -4,7 +4,7 @@ version = "0.1.0"
- authors = ["Vincent Prouillet <prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
--tera = "1.0.0-beta.10"
-+tera = "1.0.0-beta.17"
- base64 = "0.10"
- lazy_static = "1"
- pulldown-cmark = "0.6"
-diff --git a/components/templates/src/lib.rs b/components/templates/src/lib.rs
-index 7eede2f..547c78a 100644
---- a/components/templates/src/lib.rs
-+++ b/components/templates/src/lib.rs
-@@ -69,6 +69,6 @@ pub fn render_redirect_template(url: &str, tera: &Tera) ->
Result<String> {
- let mut context = Context::new();
- context.insert("url", &url);
-
-- tera.render("internal/alias.html", context)
-+ tera.render("internal/alias.html", &context)
- .map_err(|e| Error::chain(format!("Failed to render alias for
'{}'", url), e))
- }
-diff --git a/components/utils/Cargo.toml b/components/utils/Cargo.toml
-index 8242533..1db8d69 100644
---- a/components/utils/Cargo.toml
-+++ b/components/utils/Cargo.toml
-@@ -5,7 +5,7 @@ authors = ["Vincent Prouillet
<prouillet.vincent(a)gmail.com>"]
-
- [dependencies]
- errors = { path = "../errors" }
--tera = "1.0.0-beta.10"
-+tera = "1.0.0-beta.17"
- unicode-segmentation = "1.2"
- walkdir = "2"
- toml = "0.5"
-diff --git a/components/utils/src/templates.rs b/components/utils/src/templates.rs
-index b031c25..2136dfb 100644
---- a/components/utils/src/templates.rs
-+++ b/components/utils/src/templates.rs
-@@ -11,7 +11,7 @@ macro_rules! render_default_tpl {
- let mut context = Context::new();
- context.insert("filename", $filename);
- context.insert("url", $url);
-- Tera::one_off(DEFAULT_TPL, context, true).map_err(std::convert::Into::into)
-+ Tera::one_off(DEFAULT_TPL, &context,
true).map_err(std::convert::Into::into)
- }};
- }
-
-@@ -27,21 +27,21 @@ pub fn render_template(
- ) -> Result<String> {
- // check if it is in the templates
- if tera.templates.contains_key(name) {
-- return tera.render(name, context).map_err(std::convert::Into::into);
-+ return tera.render(name, &context).map_err(std::convert::Into::into);
- }
-
- // check if it is part of a theme
- if let Some(ref t) = *theme {
- let theme_template_name = format!("{}/templates/{}", t, name);
- if tera.templates.contains_key(&theme_template_name) {
-- return tera.render(&theme_template_name,
context).map_err(std::convert::Into::into);
-+ return tera.render(&theme_template_name,
&context).map_err(std::convert::Into::into);
- }
- }
-
- // check if it is part of ZOLA_TERA defaults
- let default_name = format!("__zola_builtins/{}", name);
- if tera.templates.contains_key(&default_name) {
-- return tera.render(&default_name,
context).map_err(std::convert::Into::into);
-+ return tera.render(&default_name,
&context).map_err(std::convert::Into::into);
- }
-
- // maybe it's a default one?
---
-2.24.1
-
diff --git a/0001-chore-Update-actix-web-to-2.0.0-and-actix-files-to-0.patch
b/0001-chore-Update-actix-web-to-2.0.0-and-actix-files-to-0.patch
deleted file mode 100644
index ea13af8..0000000
--- a/0001-chore-Update-actix-web-to-2.0.0-and-actix-files-to-0.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fda86b02d5a1066716ef5afc9d4a7789aebeca05 Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain(a)gmail.com>
-Date: Fri, 20 Dec 2019 16:52:46 +0100
-Subject: [PATCH] chore: Update actix-web to 2.0.0 and actix-files to 0.2.0
-
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain(a)gmail.com>
----
- Cargo.toml | 4 ++--
- src/cmd/serve.rs | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 065a70b..4faef41 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -25,8 +25,8 @@ termcolor = "1.0.4"
- # Used in init to ensure the url given as base_url is a valid one
- url = "2"
- # Below is for the serve cmd
--actix-files = "0.1"
--actix-web = { version = "1.0", default-features = false, features = [] }
-+actix-files = "0.2.0"
-+actix-web = { version = "2.0.0-rc", default-features = false, features = [] }
- notify = "4"
- ws = "0.9"
- ctrlc = "3"
-diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs
-index 32ccae9..d9906bc 100644
---- a/src/cmd/serve.rs
-+++ b/src/cmd/serve.rs
-@@ -224,7 +224,7 @@ pub fn serve(
- eprintln!("Failed to open URL in your browser: {}", err);
- }
- }
-- s.run()
-+ s.start()
- });
- // The websocket for livereload
- let ws_server = WebSocket::new(|output: Sender| {
---
-2.24.1
-
diff --git a/sources b/sources
index b8cc954..2f42955 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zola-0.9.0.tar.gz) =
e9496b57e005a751e85533807f6be275d187baa3f4371a29416dd7d2373d9214ee3469b032102c0544782527f93692d9d71a40d20e34cfe776be058777374756
+SHA512 (zola-0.10.0.tar.gz) =
20f71426b111ce619e99ef86c979d3737dafb40328c25fad0e728ae3addf7d1801c58635ceed3df308780293ba32cc68963a8f5f5a94c0cae550c32297c48d44
diff --git a/zola.spec b/zola.spec
index 81b29c8..becbd8e 100644
--- a/zola.spec
+++ b/zola.spec
@@ -1,30 +1,37 @@
-# Generated by rust2rpm 11 + a lot of manual work
+# Generated by rust2rpm 13 + a lot of manual work
%bcond_without check
%global __cargo_skip_build 0
Name: zola
-Version: 0.9.0
-Release: 2%{?dist}
+Version: 0.10.0
+Release: 1%{?dist}
Summary: Fast static site generator with everything built-in
-License: MIT
+# Upstream license specification: MIT
+# Install all deps (without check), grab their licenses and make it simple
+# * 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) and BSD
+# * (MIT or ASL 2.0) and Public Domain
+# * MIT or BSD
+# * Unlicense or MIT
+# * zlib
+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}.ta...
-#
https://github.com/getzola/zola/commit/82ac173efefcfd1e1046fe6e064cdad291...
-Patch0001: 0001-Update-tera.patch
-#
https://github.com/getzola/zola/commit/0cd047bde036c64fa98a6cbcd75507f976...
-Patch0002: 0001-Update-base64.patch
-#
https://github.com/getzola/zola/commit/d61e3dd16f4172a5f361e44685c309d839...
-Patch0003: 0001-Update-Tera.patch
-#
https://github.com/getzola/zola/pull/889
-Patch0004: 0001-chore-Update-actix-web-to-2.0.0-and-actix-files-to-0.patch
ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging
# src/cmd/livereload.js
-Provides: bundled(js-livereload-js) = 3.0.0
+Provides: bundled(js-livereload-js) = 3.2.1
# components/search/src/elasticlunr.min.js
Provides: bundled(js-elasticlunr-js) = 0.9.5
@@ -34,11 +41,13 @@ Provides: bundled(js-elasticlunr-js) = 0.9.5
%prep
%autosetup -p1
#
https://bugzilla.redhat.com/show_bug.cgi?id=1723064
-%ifarch %{ix86} armv7hl
+%if 0%{?__isa_bits} == 32
sed -i -e '/lto/d' Cargo.toml
%endif
#
https://github.com/getzola/zola/issues/876
find -type f -name 'Cargo.toml' -exec sed -i -e '/syntect/s/=3.2.0/3/' {}
+
+#
https://github.com/getzola/zola/commit/a903473a87239213e8656aad8d6de075d0...
+sed -i -e 's/, "rustls-tls"//' components/link_checker/Cargo.toml
%cargo_prep
%generate_buildrequires
@@ -83,6 +92,9 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions \
%{_datadir}/zsh/site-functions/_zola
%changelog
+* Mon Feb 17 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> - 0.10.0-1
+- Update to 0.10.0
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild