Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package roundcubemail for openSUSE:Factory
checked in at 2021-01-30 13:56:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/roundcubemail (Old)
and /work/SRC/openSUSE:Factory/.roundcubemail.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "roundcubemail"
Sat Jan 30 13:56:40 2021 rev:70 rq:867791 version:1.4.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/roundcubemail/roundcubemail.changes
2020-12-28 13:56:16.569036966 +0100
+++ /work/SRC/openSUSE:Factory/.roundcubemail.new.28504/roundcubemail.changes
2021-01-30 13:57:45.978396946 +0100
@@ -1,0 +2,8 @@
+Fri Jan 22 17:46:59 UTC 2021 - Arjen de Korte <suse+bu...@de-korte.org>
+
+- add PHP version to Requires: and Recommends: to make sure the same
+ version is installed as used during packaging
+- drop Requires: http_daemon (fixes boo#1180132) and Suggests: apache2
+ (which is already required though mod_php_any)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ roundcubemail.spec ++++++
--- /var/tmp/diff_new_pack.wmvXVg/_old 2021-01-30 13:57:47.026398714 +0100
+++ /var/tmp/diff_new_pack.wmvXVg/_new 2021-01-30 13:57:47.026398714 +0100
@@ -1,7 +1,7 @@
#
# spec file for package roundcubemail
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define roundcubepath %{apache_serverroot}/%{name}
%define roundcubeconfigpath %{_sysconfdir}/%{name}
-%define php_major_version %(php -r "echo PHP_MAJOR_VERSION;")
+%define php_name %(php -r "print 'php' . PHP_MAJOR_VERSION;")
Name: roundcubemail
Version: 1.4.10
Release: 0
@@ -39,17 +39,17 @@
Patch0: %{name}-config_dir.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2
-BuildRequires: php
-Requires: http_daemon
-Requires: mod_php_any >= 5.4
-Requires: php-dom
-Requires: php-exif
-Requires: php-gettext
-Requires: php-iconv
-Requires: php-json
-Requires: php-mbstring
-Requires: php-openssl
+BuildRequires: php-cli
+Requires: %{php_name}-dom
+Requires: %{php_name}-exif
+Requires: %{php_name}-gettext
+Requires: %{php_name}-iconv
+Requires: %{php_name}-json
+Requires: %{php_name}-mbstring
+Requires: %{php_name}-openssl
+Requires: apache2-mod_%{php_name}
## Requires: for upstream dep package
+Requires: %{php_name}-sockets
Requires: php-pear-Auth_SASL >= 1.0.6
Requires: php-pear-MDB2_Driver_mysqli
Requires: php-pear-Mail_Mime >= 1.10.0
@@ -58,17 +58,14 @@
Requires: php-pear-Net_SMTP >= 1.8.1
Requires: php-pear-Net_Sieve >= 1.4.3
Requires: php-pear-Net_Socket >= 1.0.12
-Requires: php-session
-Requires: php-sockets
-Requires: php_any_db
+Requires: (%{php_name}-mysql or %{php_name}-pgsql)
Recommends: logrotate
-Recommends: php-fileinfo
-Recommends: php-intl
-Recommends: php-imagick
-Recommends: php-mysql
+Recommends: %{php_name}-fileinfo
+Recommends: %{php_name}-intl
+Recommends: %{php_name}-imagick
Recommends: php-pear-Crypt_GPG >= 1.6.3
-Recommends: php-zip
-Suggests: apache2
+Recommends: %{php_name}-zip
+Suggests: %{php_name}-mysql
Conflicts: roundcube-framework
Provides: roundcube_framework = %{version}
BuildArch: noarch
@@ -117,8 +114,11 @@
# remove INSTALL doc
rm INSTALL
# fix interpreter for shell scripts
-sed -e 's|%{_bindir}/env php|%{_bindir}/php|' -i bin/*.sh
-sed -e 's|%{_bindir}/env php|%{_bindir}/php|' -i
vendor/pear/crypt_gpg/scripts/crypt-gpg-pinentry
vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh
+sed -i 's|/usr/bin/env php|%{_bindir}/php|' \
+ bin/*.sh \
+ vendor/pear/crypt_gpg/scripts/crypt-gpg-pinentry \
+ vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh \
+ plugins/enigma/bin/import_keys.sh
%build
@@ -128,8 +128,8 @@
install %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
# extract roundcube-framework
-install -d -m 0755 %{buildroot}/%{_datadir}/php%{php_major_version}
-mv program/lib/Roundcube
%{buildroot}%{_datadir}/php%{php_major_version}/Roundcube
+install -d -m 0755 %{buildroot}/%{_datadir}/%{php_name}
+mv program/lib/Roundcube %{buildroot}%{_datadir}/%{php_name}/Roundcube
# install roundcubemail
install -d -m 0755 %{buildroot}/%{roundcubepath}
@@ -250,7 +250,7 @@
# enable required apache modules
%if 0%{?suse_version} > 01500
if ! grep -q php %{_sysconfdir}/sysconfig/apache2 1>&2 2>/dev/null; then
- %{_sbindir}/a2enmod -q php7 || %{_sbindir}/a2enmod php7
+ %{_sbindir}/a2enmod -q %{php_name} || %{_sbindir}/a2enmod %{php_name}
fi
%endif
for module in alias brotli deflate expires filter headers rewrite setenvif
version ; do
@@ -353,8 +353,7 @@
%{roundcubepath}/SQL
%{roundcubepath}/temp
%{roundcubepath}/vendor/
-%dir %{_datadir}/php%{php_major_version}
-%{_datadir}/php%{php_major_version}/Roundcube/
+%{_datadir}/%{php_name}/Roundcube
%attr(-, wwwrun, root) %{_localstatedir}/log/%{name}
%attr(-, wwwrun, root) %{_localstatedir}/lib/%{name}
