diff --git a/0001-Fix-one-more-typo-179.patch b/0001-Fix-one-more-typo-179.patch deleted file mode 100644 index 48148ea..0000000 --- a/0001-Fix-one-more-typo-179.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6eab1b0993b01a3acdb4532ca22543eee8b48c00 Mon Sep 17 00:00:00 2001 -From: Elisei Roca -Date: Thu, 5 Aug 2021 12:19:59 +0200 -Subject: Fix one more typo (#179) - ---- - lib/MirrorCache/WebAPI/Plugin/RootRemote.pm | 2 +- - lib/MirrorCache/WebAPI/Plugin/RootRsync.pm | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/MirrorCache/WebAPI/Plugin/RootRemote.pm b/lib/MirrorCache/WebAPI/Plugin/RootRemote.pm -index 2bc23b1..d79bf99 100644 ---- a/lib/MirrorCache/WebAPI/Plugin/RootRemote.pm -+++ b/lib/MirrorCache/WebAPI/Plugin/RootRemote.pm -@@ -98,7 +98,7 @@ sub location { - $c = $dm->c if $dm; - if ($dm && $ENV{MIRRORCACHE_REDIRECT_VPN} && $dm->vpn) { - return $self->rooturlredirectvpn . $filepath unless $c && $c->req->is_secure; -- return $self->rooturlredirectbpns . $filepath; -+ return $self->rooturlredirectvpns . $filepath; - } - return $self->rooturlredirect . $filepath unless $c && $c->req->is_secure; - return $self->rooturlredirects . $filepath; -diff --git a/lib/MirrorCache/WebAPI/Plugin/RootRsync.pm b/lib/MirrorCache/WebAPI/Plugin/RootRsync.pm -index 88696de..5c8eae8 100644 ---- a/lib/MirrorCache/WebAPI/Plugin/RootRsync.pm -+++ b/lib/MirrorCache/WebAPI/Plugin/RootRsync.pm -@@ -116,7 +116,7 @@ sub location { - $c = $dm->c if $dm; - if ($dm && $ENV{MIRRORCACHE_REDIRECT_VPN} && $dm->vpn) { - return $self->rooturlredirectvpn . $filepath unless $c && $c->req->is_secure; -- return $self->rooturlredirectbpns . $filepath; -+ return $self->rooturlredirectvpns . $filepath; - } - return $self->rooturlredirect . $filepath unless $c && $c->req->is_secure; - return $self->rooturlsredirect . $filepath; --- -2.31.1 - diff --git a/MirrorCache-1.006.obscpio b/MirrorCache-1.006.obscpio deleted file mode 100644 index 7aefa3c..0000000 --- a/MirrorCache-1.006.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4110eb8bec5088c5f5c3b32c8c6022f6ac1faecd621290d2b153337a0b66b48a -size 671244 diff --git a/MirrorCache-1.007.obscpio b/MirrorCache-1.007.obscpio new file mode 100644 index 0000000..5709d80 --- /dev/null +++ b/MirrorCache-1.007.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8bdb7dabd1be54bb0fa24bddceb74104955dde8261746968f7e8f7bbdf356e5 +size 686604 diff --git a/MirrorCache.changes b/MirrorCache.changes index 6f3f133..800bfcf 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Sep 10 17:17:16 UTC 2021 - Elisei Roca + +- Update to version 1.007: + * UI: Solidify branding into lesser files + * Remove SUSE branding, it is not needed here + * Allow multiple folders in MIRRORCACHE_ROOT (#186) + * Show filestamps when rendering files with RootLocal (#184) + * Render error for when metalink and mirrorlist when file is not in DB (#185) + * Add parameter MIRRORCACHE_VPN_PREFIX (#182) + * Change origin in metalink to show metalink url + * [doc] fix in README command for geoip modules + * Use hostname_vpn in capability checks + * Fix one more typo (#179) + +- Remove 0001-Fix-one-more-typo-179.patch - included in 1.007 + ------------------------------------------------------------------- Mon Aug 16 12:52:04 UTC 2021 - Elisei Roca diff --git a/MirrorCache.obsinfo b/MirrorCache.obsinfo index 598937b..082c5ae 100644 --- a/MirrorCache.obsinfo +++ b/MirrorCache.obsinfo @@ -1,5 +1,5 @@ name: MirrorCache -version: 1.006 -mtime: 1628148416 -commit: 2093fd2adec591ab1274d10dacf22b2340539a78 +version: 1.007 +mtime: 1631173530 +commit: e100d02a2e350932299ee611f7461535648c23f1 diff --git a/MirrorCache.spec b/MirrorCache.spec index cb29ba0..0c61c0a 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -21,7 +21,7 @@ %define main_requires %{assetpack_requires} perl(Carp) perl(DBD::Pg) >= 3.7.4 perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801 perl(DBIx::Class::DynamicDefault) perl(DateTime) perl(Encode) perl(Time::Piece) perl(Time::Seconds) perl(Time::ParseDate) perl(DateTime::Format::Pg) perl(Exporter) perl(File::Basename) perl(LWP::UserAgent) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Sort::Versions) perl(URI::Escape) perl(XML::Writer) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings) shadow rubygem(sass) perl(Net::DNS) perl(LWP::Protocol::https) perl(Digest::SHA) %define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow sysuser-tools Name: MirrorCache -Version: 1.006 +Version: 1.007 Release: 0 Summary: WebApp to redirect and manage mirrors License: GPL-2.0-or-later @@ -30,7 +30,6 @@ URL: https://github.com/openSUSE/MirrorCache Source: %{name}-%{version}.tar.xz Source1: %{name}-user.conf Source2: %{name}-tmpfilesd.conf -Patch: 0001-Fix-one-more-typo-179.patch BuildRequires: %{build_requires} Requires: %{main_requires} Requires: perl(Minion) >= 10.0 @@ -42,7 +41,6 @@ Mirror redirector web service, which automatically scans the main server and mir %prep %setup -q -%patch -p1 %build # make {?_smp_mflags}