[arch-commits] Commit in tt-rss/trunk (PKGBUILD service tt-rss.install tt-rss.service)

[Anatol Pomozov]

    Date: Tuesday, February 2, 2021 @ 01:07:13
  Author: anatolik
Revision: 840932

Move tt-rss to PHP7

Add a notice to INSTALL script

Added:
  tt-rss/trunk/tt-rss.service
    (from rev 840931, tt-rss/trunk/service)
Modified:
  tt-rss/trunk/PKGBUILD
  tt-rss/trunk/tt-rss.install
Deleted:
  tt-rss/trunk/service

----------------+
 PKGBUILD       |    6 +++---
 service        |   10 ----------
 tt-rss.install |   11 +++++++----
 tt-rss.service |   10 ++++++++++
 4 files changed, 20 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-02 00:43:30 UTC (rev 840931)
+++ PKGBUILD	2021-02-02 01:07:13 UTC (rev 840932)
@@ -6,7 +6,7 @@
 
 pkgname=tt-rss
 pkgver=r10198.6d8f2221b
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Web-based news feed (RSS/Atom) aggregator'
 arch=(any)
@@ -22,7 +22,7 @@
 _commit=6d8f2221b82b6a31becbeed8baf5e05ad9e053fe
 # periodic releases are over https://tt-rss.org/forum/viewtopic.php?f=10&t=3262
 source=(git+https://git.tt-rss.org/fox/tt-rss.git#commit=$_commit
-        service
+        tt-rss.service
 	php7.patch)
 sha1sums=('SKIP'
           '6975508c8cbe86152489fc6f1887c1d0d7df19e0'
@@ -58,5 +58,5 @@
   chown -R 33:33 "$pkgdir"/var/lib/tt-rss
   chmod -R 777 "$pkgdir"/var/lib/tt-rss/*
 
-  install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/tt-rss.service
+  install -Dm644 "$srcdir"/tt-rss.service "$pkgdir"/usr/lib/systemd/system/tt-rss.service
 }

Deleted: service
===================================================================
--- service	2021-02-02 00:43:30 UTC (rev 840931)
+++ service	2021-02-02 01:07:13 UTC (rev 840932)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Tiny Tiny RSS feeds update daemon
-After=network.target mysqld.service postgresql.service
-
-[Service]
-ExecStart=/usr/bin/php7 /usr/share/webapps/tt-rss/update.php --daemon
-User=http
-
-[Install]
-WantedBy=multi-user.target

Modified: tt-rss.install
===================================================================
--- tt-rss.install	2021-02-02 00:43:30 UTC (rev 840931)
+++ tt-rss.install	2021-02-02 01:07:13 UTC (rev 840932)
@@ -1,11 +1,14 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  if [ "$(vercmp $2 1:19.2.r209.gb68db2d02-1)" -le 0 ]; then
+  if [ "$(vercmp $2 2:r10198.6d8f2221b-2)" -le 0 ]; then
     cat << EOF
-===> Please make sure 'extension=intl' is enabled in PHP config (/etc/php/php.ini)
-===> Otherwise you'll get a 'PHP UConverter class is missing' error
-===> See https://wiki.archlinux.org/index.php/TT-RSS for more info
+===> tt-rss is not compliant with PHP 8 yet and requires use of PHP 7.
+===>   https://bugs.archlinux.org/task/69462
+===> Please reconfigure PHP-specific bits:
+===>   * Enable required modules in /etc/php7/php.ini
+===>   * Start/enable php-fpm7 systemd service
+===> See https://wiki.archlinux.org/index.php/TT-RSS for more information.
 EOF
   fi
 }

Copied: tt-rss/trunk/tt-rss.service (from rev 840931, tt-rss/trunk/service)
===================================================================
--- tt-rss.service	                        (rev 0)
+++ tt-rss.service	2021-02-02 01:07:13 UTC (rev 840932)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tiny Tiny RSS feeds update daemon
+After=network.target mysqld.service postgresql.service
+
+[Service]
+ExecStart=/usr/bin/php7 /usr/share/webapps/tt-rss/update.php --daemon
+User=http
+
+[Install]
+WantedBy=multi-user.target