commit cb0648c20f14689aee1f877253835cf7e444f794
Author: Jan Palus <[email protected]>
Date: Wed May 24 00:49:24 2023 +0200
up to 1.6.0
docs.patch | 45 ---------------------------------------------
netavark.spec | 9 ++++-----
2 files changed, 4 insertions(+), 50 deletions(-)
---
diff --git a/netavark.spec b/netavark.spec
index 89a0b0c..9ca2d3a 100644
--- a/netavark.spec
+++ b/netavark.spec
@@ -1,17 +1,17 @@
Summary: Container network stack
Name: netavark
-Version: 1.4.0
+Version: 1.6.0
Release: 1
License: Apache v2.0
Group: Applications/System
Source0:
https://github.com/containers/netavark/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: b818749229983952abfcc5c172636609
+# Source0-md5: d74d976ff73153cd398853a8b114ea9d
Source1:
https://github.com/containers/netavark/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
-# Source1-md5: 6f4d384c90c043cd9eff063b44d15ce9
-Patch0: docs.patch
+# Source1-md5: 7d50dcc38f030c28389a86eed4a753f3
URL: https://github.com/containers/netavark
BuildRequires: cargo
BuildRequires: mandown
+BuildRequires: protobuf
BuildRequires: rpmbuild(macros) >= 2.004
BuildRequires: rust
Suggests: aardvark-dns
@@ -34,7 +34,6 @@ Its features include:
%prep
%setup -q -a1
-%patch0 -p1
# use our offline registry
export CARGO_HOME="$(pwd)/.cargo"
diff --git a/docs.patch b/docs.patch
deleted file mode 100644
index c94f9eb..0000000
--- a/docs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 97e90a303051d19469ac474b8877620b1354168f Mon Sep 17 00:00:00 2001
-From: Paul Holzinger <[email protected]>
-Date: Wed, 14 Dec 2022 16:06:29 +0100
-Subject: [PATCH] fix make docs
-
-Regression caused by 011f899919c9. We only want to build actual man
-pages of course and not general docs.
-This commit fixes the wildcard target to only use the `.1.md` files
-instead of all markdown files.
-Also add the step to the validate target to make sure CI tests this
-target.
-
-Fixes #524
-
-Signed-off-by: Paul Holzinger <[email protected]>
----
- Makefile | 1 +
- docs/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 93f1258e..abf61c0e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -101,6 +101,7 @@ integration: $(CARGO_TARGET_DIR)
- validate: $(CARGO_TARGET_DIR)
- cargo fmt --all -- --check
- cargo clippy -p netavark -- -D warnings
-+ $(MAKE) docs
-
- .PHONY: vendor-tarball
- vendor-tarball: build install.cargo-vendor-filterer
-diff --git a/docs/Makefile b/docs/Makefile
-index 29a15131..112e0ab2 100644
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -3,7 +3,7 @@ DATADIR ?= ${PREFIX}/share
- MANDIR ?= $(DATADIR)/man
- MANDOWN ?= $(shell export PATH; command -v mandown)
-
--docs: $(patsubst %.md,%,$(wildcard *.md))
-+docs: $(patsubst %.md,%,$(wildcard *.1.md))
-
- %.1: %.1.md
- $(MANDOWN) $< > $@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/netavark.git/commitdiff/cb0648c20f14689aee1f877253835cf7e444f794
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
