diff --git a/caddy.spec b/caddy.spec index dc1ab26..8cc204c 100644 --- a/caddy.spec +++ b/caddy.spec @@ -17,7 +17,7 @@ Version: %{basever}%{?prerel:~%{prerel}%{prerelnum}} Caddy is the web server with automatic HTTPS.} Name: caddy -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web server with automatic HTTPS %if %{with vendor} # github.com/caddyserver/caddy ASL 2.0 @@ -73,9 +73,10 @@ Source0: %{gosource} Source1: Caddyfile Source2: caddy.service Source3: caddy-api.service -Source4: poweredby.png -Source5: bash-completion -Source6: zsh-completion +Source4: poweredby-white.png +Source5: poweredby-black.png +Source6: bash-completion +Source7: zsh-completion # downstream only patch to disable commands that can alter the binary Patch: 0001-Disable-commands-that-can-alter-the-binary.patch @@ -190,14 +191,18 @@ install -D -p -m 0644 %{S:3} %{buildroot}%{_unitdir}/caddy-api.service install -d -m 0750 %{buildroot}%{_sharedstatedir}/caddy # welcome page +%if %{defined fedora} install -D -p -m 0644 %{S:4} %{buildroot}%{_datadir}/caddy/poweredby.png -ln -s ../fedora-testpage/index.html %{buildroot}%{_datadir}/caddy/index.html +%else +install -D -p -m 0644 %{S:5} %{buildroot}%{_datadir}/caddy/poweredby.png +%endif +ln -s ../testpage/index.html %{buildroot}%{_datadir}/caddy/index.html install -d -m 0755 %{buildroot}%{_datadir}/caddy/icons ln -s ../../pixmaps/poweredby.png %{buildroot}%{_datadir}/caddy/icons/poweredby.png # shell completion -install -D -p -m 0644 %{S:5} %{buildroot}%{_datadir}/bash-completion/completions/caddy -install -D -p -m 0644 %{S:6} %{buildroot}%{_datadir}/zsh/site-functions/_caddy +install -D -p -m 0644 %{S:6} %{buildroot}%{_datadir}/bash-completion/completions/caddy +install -D -p -m 0644 %{S:7} %{buildroot}%{_datadir}/zsh/site-functions/_caddy %if %{with check} @@ -290,6 +295,9 @@ fi %changelog +* Fri Feb 25 2022 Carl George - 2.4.6-2 +- Update welcome page symlink and image to work on both Fedora and EPEL + * Wed Feb 16 2022 Carl George - 2.4.6-1 - Latest upstream rhbz#1984163 diff --git a/poweredby-black.png b/poweredby-black.png new file mode 100644 index 0000000..eb8e284 Binary files /dev/null and b/poweredby-black.png differ diff --git a/poweredby-white.png b/poweredby-white.png new file mode 100644 index 0000000..8131407 Binary files /dev/null and b/poweredby-white.png differ diff --git a/poweredby.png b/poweredby.png deleted file mode 100644 index 8131407..0000000 Binary files a/poweredby.png and /dev/null differ