diff --git a/ahriman/.SRCINFO b/ahriman/.SRCINFO index 041f5f5..6073b33 100644 --- a/ahriman/.SRCINFO +++ b/ahriman/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ahriman pkgdesc = ArcH linux ReposItory MANager - pkgver = 2.11.0 + pkgver = 2.12.2 pkgrel = 1 url = https://github.com/arcan1s/ahriman install = ahriman.install @@ -38,11 +38,11 @@ pkgbase = ahriman optdepends = subversion: -svn packages support backup = etc/ahriman.ini backup = etc/ahriman.ini.d/logging.ini - source = https://github.com/arcan1s/ahriman/releases/download/2.11.0/ahriman-2.11.0-src.tar.xz + source = https://github.com/arcan1s/ahriman/releases/download/2.12.2/ahriman-2.12.2-src.tar.xz source = ahriman.sysusers source = ahriman.tmpfiles - sha512sums = 0f168b66d3cda7205426fd72e745fbed1fd155541a7942298a522cd4ed81bbef50e21eea64baf42331b47033691a770fa07b475b1af8f0de514da2f69b95ce71 + sha512sums = 7f42dac64436a7b83b777ae6d420e1d72fdf3c27de40a1da199ea437e6b6c9290699a5e0628bee4768b8e37509d842980d5223789e5c6866be722e76dd4e0aed sha512sums = b1dd772f8802be99ccba3add5f1e6f78e5e79d0967342668dd12e472651a6b91c342f11fba330caaca421cc3d6c7e2011e09a6bd131f8ba14bbc4a6206cce539 - sha512sums = 62b2eccc352d33853ef243c9cddd63663014aa97b87242f1b5bc5099a7dbd69ff3821f24ffc58e1b7f2387bd4e9e9712cc4c67f661b1724ad99cdf09b3717794 + sha512sums = ac22af25fc08f5bf1b9acbb77bbb6b2bb7af12d78ff1ae99463c16f36f1dd5ebae3af1413e353634aed5275af0eefee41257eded7987e67ae6a9411999d5a2ba pkgname = ahriman diff --git a/ahriman/PKGBUILD b/ahriman/PKGBUILD index 07d9237..4bf8dae 100644 --- a/ahriman/PKGBUILD +++ b/ahriman/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Evgeniy Alekseev pkgname='ahriman' -pkgver=2.11.0 +pkgver=2.12.2 pkgrel=1 pkgdesc="ArcH linux ReposItory MANager" arch=('any') @@ -46,7 +46,7 @@ package() { python -m installer --destdir="$pkgdir" "dist/$pkgname-$pkgver-py3-none-any.whl" # thanks too PEP517, which we all wanted, you need to install data files manually nowadays - pushd package && find . -type f -exec install -Dm644 "{}" "$pkgdir/usr/{}" \; && popd + pushd package && find . \( -type f -or -type l \) -exec install -Dm644 "{}" "$pkgdir/usr/{}" \; && popd # keep usr/share configs as reference and copy them to /etc install -Dm644 "$pkgdir/usr/share/$pkgname/settings/ahriman.ini" "$pkgdir/etc/ahriman.ini" @@ -56,6 +56,6 @@ package() { install -Dm644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" } -sha512sums=('0f168b66d3cda7205426fd72e745fbed1fd155541a7942298a522cd4ed81bbef50e21eea64baf42331b47033691a770fa07b475b1af8f0de514da2f69b95ce71' +sha512sums=('7f42dac64436a7b83b777ae6d420e1d72fdf3c27de40a1da199ea437e6b6c9290699a5e0628bee4768b8e37509d842980d5223789e5c6866be722e76dd4e0aed' 'b1dd772f8802be99ccba3add5f1e6f78e5e79d0967342668dd12e472651a6b91c342f11fba330caaca421cc3d6c7e2011e09a6bd131f8ba14bbc4a6206cce539' - '62b2eccc352d33853ef243c9cddd63663014aa97b87242f1b5bc5099a7dbd69ff3821f24ffc58e1b7f2387bd4e9e9712cc4c67f661b1724ad99cdf09b3717794') + 'ac22af25fc08f5bf1b9acbb77bbb6b2bb7af12d78ff1ae99463c16f36f1dd5ebae3af1413e353634aed5275af0eefee41257eded7987e67ae6a9411999d5a2ba') diff --git a/ahriman/ahriman.install b/ahriman/ahriman.install index e1a3813..b59cbe3 100644 --- a/ahriman/ahriman.install +++ b/ahriman/ahriman.install @@ -1,10 +1,11 @@ post_upgrade() { local breakpoints=( 2.9.0-1 + 2.12.0-1 ) for v in "${breakpoints[@]}"; do - if [[ $(vercmp "$v" "$2") -eq 1 ]]; then + if [[ $(vercmp "$v" "$2") -ne "-1" ]]; then "_${v//[.-]/_}_changes" fi done @@ -12,14 +13,30 @@ post_upgrade() { _2_9_0_1_changes() { cat << EOF -It was found that you were upgrading from old-devtools package to the new one, which requires manual intervention: +It was found that there was an upgrade from old devtools package to the new one, which requires manual intervention: * make sure that devtools are upgraded to the latest release; -* merge service configuration if required; -* run setup command (i.e. sudo ahriman service-setup) with the same arguments as you did before; -* remove build chroot: sudo rm -r /var/lib/ahriman/chroot/ahriman-x86_64/; -* update local databases: sudo -u ahriman ahriman update --no-aur --no-local --no-manual -yy; +* merge upstream configuration into local configuration (e.g. by using pacdiff); +* run setup command (i.e. ahriman service-setup) with the same arguments as did before; +* remove build chroot, e.g.: ahriman service-clean --chroot; +* update local databases: ahriman update --no-aur --no-local --no-manual -yy. -For more information kindly refer to changelog https://github.com/arcan1s/ahriman/releases/tag/2.9.0 +For more information kindly refer to migration notes https://ahriman.readthedocs.io/en/stable/migration.html. +EOF +} + +_2_12_0_1_changes() { + cat << EOF +Whereas old local tree is still supported it is highly recommended to migrate to the new one: + +* stop and disable all services; +* run service-tree-migrate as ahriman user; +* edit local configuration to avoid pointing to the old paths; +* run setup command (i.e. ahriman service-setup) with the same arguments as did before; +* update remote services in order to support new paths (or setup redirects) if any; +* enable web and timer services again by using x86_64-aur-clone suffix, + where x86_64 is the repository architecture and aur-clone is the repository name. + +For more information kindly refer to migration notes https://ahriman.readthedocs.io/en/stable/migration.html. EOF } diff --git a/ahriman/ahriman.tmpfiles b/ahriman/ahriman.tmpfiles index 8ecb3e2..6a1b6ba 100644 --- a/ahriman/ahriman.tmpfiles +++ b/ahriman/ahriman.tmpfiles @@ -1,2 +1 @@ -d /var/lib/ahriman 0755 ahriman ahriman -d /var/log/ahriman 0755 ahriman ahriman \ No newline at end of file +d /var/lib/ahriman 0755 ahriman ahriman \ No newline at end of file