diff options
| -rw-r--r-- | libre/reflector/PKGBUILD | 14 | ||||
| -rw-r--r-- | libre/reflector/rebranding.patch | 31 |
2 files changed, 20 insertions, 25 deletions
diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD index ab95cbdec..09171dea3 100644 --- a/libre/reflector/PKGBUILD +++ b/libre/reflector/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: grizzlyuser <grizzlyuser@protonmail.com> pkgname=reflector -pkgver=2020.3.21.2 +pkgver=2020.9 pkgrel=1 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)' arch=(any) @@ -14,23 +14,24 @@ replaces=(${pkgname}-parabola) conflicts=(${pkgname}-parabola) depends=(python3) optdepends=('rsync: rate rsync mirrors') +backup=(etc/xdg/reflector/reflector.conf) source=( https://xyne.archlinux.ca/projects/reflector/src/reflector-${pkgver}.tar.xz https://xyne.archlinux.ca/projects/reflector/src/reflector-${pkgver}.tar.xz.sig rebranding.patch ) -sha512sums=('cdb1ae3806fca6dd7dd7dccc75ef677e70ceec5d61b140315ef88540513abd7131dc2260f261444d801490368ab73194c7718d974c6191c7c354fcb811ba35e2' +sha512sums=('2cfad4919cd7cd0c3e4be2d99f2ef7d2df3b39254fc5494b2f858fb8f07f22278688a4b3708aecd109f0602d4b93a335ef15e08c3b48f61c2f2090bbaa58fc4e' 'SKIP' - 'f9b86f7b63398adcd037a332d9f335b35f5a3dee7aeeb3b38e6ae11ed3b038c82bf47f9e94281bb2d1942f10056197209ce48433f1769f26554dbff6c9ad69ec') + '555b7d455ffc29e8d20c938632c0c278959bc4946427680f462e56fb7aa7681780c0f7b0ecf5ff89a9cfca7524d441304fc08feeb4ad167c206003921a09a9ca') validpgpkeys=('EC3CBE7F607D11E663149E811D1F0DC78F173680') prepare () { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" # Rebranding for Parabola gunzip "man/${pkgname}.1.gz" - patch -Np1 -i "$srcdir/rebranding.patch" + patch -Np1 -i ../rebranding.patch gzip "man/${pkgname}.1" } @@ -40,4 +41,7 @@ package () python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 install -Dm755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname" install -Dm644 "man/${pkgname}.1.gz" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz" + install -Dm644 'reflector.service' "$pkgdir/usr/lib/systemd/system/reflector.service" + install -Dm644 'reflector.timer' "$pkgdir/usr/lib/systemd/system/reflector.timer" + install -Dm644 'reflector.conf' "$pkgdir/etc/xdg/reflector/reflector.conf" } diff --git a/libre/reflector/rebranding.patch b/libre/reflector/rebranding.patch index 1afa8e554..e035cfaae 100644 --- a/libre/reflector/rebranding.patch +++ b/libre/reflector/rebranding.patch @@ -1,5 +1,5 @@ diff --git a/Reflector.py b/Reflector.py -index 5263316..3498174 100644 +index 1665090..045fb94 100644 --- a/Reflector.py +++ b/Reflector.py @@ -20,7 +20,7 @@ @@ -11,7 +11,7 @@ index 5263316..3498174 100644 ''' import argparse -@@ -48,7 +48,7 @@ import urllib.request +@@ -49,7 +49,7 @@ import urllib.request NAME = 'Reflector' @@ -20,7 +20,7 @@ index 5263316..3498174 100644 DISPLAY_TIME_FORMAT = '%Y-%m-%d %H:%M:%S UTC' PARSE_TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ' -@@ -440,7 +440,7 @@ def format_mirrorlist(mirror_status, mtime, include_country=False, command=None, +@@ -441,7 +441,7 @@ def format_mirrorlist(mirror_status, mtime, include_country=False, command=None, width = 80 colw = 11 @@ -29,7 +29,7 @@ index 5263316..3498174 100644 border = '#' * len(header) mirrorlist = f'{border}\n{header}\n{border}\n\n' + \ '\n'.join( -@@ -494,8 +494,18 @@ class MirrorStatus(): +@@ -495,8 +495,18 @@ class MirrorStatus(): 'extra', 'gnome-unstable', 'kde-unstable', @@ -49,16 +49,7 @@ index 5263316..3498174 100644 'staging', 'testing' ) -@@ -638,7 +648,7 @@ def add_arguments(parser): - ''' - Add reflector arguments to the argument parser. - ''' -- parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Arch Linux mirrors') -+ parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors') - - parser.add_argument( - '--connection-timeout', type=int, metavar='n', default=DEFAULT_CONNECTION_TIMEOUT, -@@ -657,7 +667,7 @@ def add_arguments(parser): +@@ -656,7 +666,7 @@ def add_arguments(parser): parser.add_argument( '--cache-timeout', type=int, metavar='n', default=DEFAULT_CACHE_TIMEOUT, @@ -67,17 +58,17 @@ index 5263316..3498174 100644 ) parser.add_argument( -@@ -769,7 +779,7 @@ def parse_args(args=None): +@@ -790,7 +800,7 @@ def parse_args(args=None): Parse command-line arguments. ''' - parser = argparse.ArgumentParser( -- description='retrieve and filter a list of the latest Arch Linux mirrors' -+ description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors' + parser = MyArgumentParser( +- description='retrieve and filter a list of the latest Arch Linux mirrors', ++ description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors', + fromfile_prefix_chars='@' ) parser = add_arguments(parser) - options = parser.parse_args(args) diff --git a/man/reflector.1 b/man/reflector.1 -index 4a9a5d2..139dec6 100644 +index d5751eb..665e74b 100644 --- a/man/reflector.1 +++ b/man/reflector.1 @@ -11,8 +11,8 @@ reflector - retrieve and filter the latest Pacman mirrorlist |