php-gitter: import from rawhide
php-gitter: backport stuff