diff --git a/fix-varnish-devel-installation-failure.patch b/fix-varnish-devel-installation-failure.patch new file mode 100644 index 0000000000000000000000000000000000000000..a125e9921aac36888e8a1f1005cdb7dc0835573b --- /dev/null +++ b/fix-varnish-devel-installation-failure.patch @@ -0,0 +1,88 @@ +From a022cd62660fdd6405563fe568e786ec759fc2b5 Mon Sep 17 00:00:00 2001 +From: wu-leilei +Date: Fri, 21 Jan 2022 15:52:05 +0800 +Subject: [PATCH] fix varnish-devel installation failure + +--- + bin/varnishtest/huffman_gen.py | 2 +- + doc/sphinx/vtc-syntax.py | 2 +- + lib/libvarnishapi/generate.py | 2 +- + lib/libvcc/generate.py | 2 +- + lib/libvcc/vmodtool.py | 2 +- + lib/libvcc/vsctool.py | 2 +- + wflags.py | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/bin/varnishtest/huffman_gen.py b/bin/varnishtest/huffman_gen.py +index 1320424..a9666fb 100755 +--- a/bin/varnishtest/huffman_gen.py ++++ b/bin/varnishtest/huffman_gen.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + + import re + import sys +diff --git a/doc/sphinx/vtc-syntax.py b/doc/sphinx/vtc-syntax.py +index f5533e8..7009142 100644 +--- a/doc/sphinx/vtc-syntax.py ++++ b/doc/sphinx/vtc-syntax.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + # + # Copyright (c) 2006-2016 Varnish Software AS + # All rights reserved. +diff --git a/lib/libvarnishapi/generate.py b/lib/libvarnishapi/generate.py +index 10bef42..3619779 100755 +--- a/lib/libvarnishapi/generate.py ++++ b/lib/libvarnishapi/generate.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + #- + # Copyright (c) 2006 Verdens Gang AS + # Copyright (c) 2006-2015 Varnish Software AS +diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py +index a2b318b..ecf2c50 100755 +--- a/lib/libvcc/generate.py ++++ b/lib/libvcc/generate.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + # + # Copyright (c) 2006 Verdens Gang AS + # Copyright (c) 2006-2015 Varnish Software AS +diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py +index 0eb77c5..6b3af4d 100755 +--- a/lib/libvcc/vmodtool.py ++++ b/lib/libvcc/vmodtool.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + # + # Copyright (c) 2010-2016 Varnish Software + # All rights reserved. +diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py +index 9df1dc4..82c8f33 100755 +--- a/lib/libvcc/vsctool.py ++++ b/lib/libvcc/vsctool.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + # -*- encoding: utf-8 -*- + # + # Copyright (c) 2017 Varnish Software AS +diff --git a/wflags.py b/wflags.py +index 9e9e4e9..90605a2 100644 +--- a/wflags.py ++++ b/wflags.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + # + # Copyright (c) 2021 Varnish Software AS + # All rights reserved. +-- +2.23.0 + diff --git a/varnish.spec b/varnish.spec index be9cc30231d57502821342dff55db415e5bbcbcc..504c7976e8c82d7ce2217fbed070e5e1f0449f86 100644 --- a/varnish.spec +++ b/varnish.spec @@ -3,13 +3,14 @@ Name: varnish Summary: A web application accelerator Version: 7.0.1 -Release: 1 +Release: 2 License: BSD URL: https://www.varnish-cache.org/ Source0: http://varnish-cache.org/_downloads/varnish-%{version}.tgz # https://github.com/varnishcache/pkg-varnish-cache Source1: https://github.com/varnishcache/pkg-varnish-cache/archive/0ad2f22629c4a368959c423a19e352c9c6c79682/pkg-varnish-cache-0ad2f22.tar.gz +Patch0001: fix-varnish-devel-installation-failure.patch BuildRequires: python3-sphinx python3-docutils pkgconfig make graphviz nghttp2 systemd-units BuildRequires: ncurses-devel pcre2-devel libedit-devel gcc @@ -157,6 +158,9 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc %{_mandir}/man7/*.7* %changelog +* Fri Jan 21 2021 wulei - 7.0.1-2 +- Fix varnish-devel installation failure + * Wed Dec 29 2021 yaoxin - 7.0.1-1 - Upgrade varnish to 7.0.1