From db0dc36509302c2046d9dbb9790f69c061039a161e3c2c197aa12708e10dde3d Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 6 Feb 2018 07:21:47 +0000 Subject: [PATCH] Accepting request 573129 from home:jengelh:branches:server:php:applications - Trim bias from description. - Replace %__-type macro indirections. - Avoid bashisms in build logic. OBS-URL: https://build.opensuse.org/request/show/573129 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=115 --- roundcubemail.changes | 7 ++++++ roundcubemail.spec | 50 +++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/roundcubemail.changes b/roundcubemail.changes index ddb4332..6823481 100644 --- a/roundcubemail.changes +++ b/roundcubemail.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 5 19:14:45 UTC 2018 - jengelh@inai.de + +- Trim bias from description. +- Replace %__-type macro indirections. +- Avoid bashisms in build logic. + ------------------------------------------------------------------- Sun Feb 4 22:36:44 UTC 2018 - joop.boonen@opensuse.org diff --git a/roundcubemail.spec b/roundcubemail.spec index 1c53b95..804a8ea 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -19,7 +19,7 @@ Name: roundcubemail Version: 1.3.4 Release: 0 -Summary: A modern browser-based multilingual IMAP client +Summary: A browser-based multilingual IMAP client License: GPL-3.0+ and GPL-2.0 and BSD-3-Clause Group: Productivity/Networking/Email/Clients @@ -87,13 +87,11 @@ Conflicts: roundcube-framework %description Roundcube Webmail is a browser-based multilingual IMAP client with an -application-like user interface. It provides full functionality you -expect from an e-mail client, including MIME support, address book, -folder manipulation, message searching and spell checking. - -Roundcube Webmail is written in PHP and requires the MySQL database. -The user interface is fully skinnable using XHTML and CSS 2. +application-like user interface. It provides MIME support, address +book, folder manipulation, message searching and spell checking. +Roundcube Webmail is written in PHP and requires a MySQL database. +The user interface is skinnable using XHTML and CSS 2. %prep %setup -q @@ -105,66 +103,66 @@ find . -name ".gitignore" -delete # no need to check .htaccess each time, the apache config takes care of the restrictions find . -name ".htaccess" -delete # remove mssql scripts (not needed on openSUSE) -%{__rm} -rf \ +rm -rf \ SQL/mssql/ \ SQL/mssql.*.sql # remove shebang from chpass-wrapper sed -i '1d' plugins/password/helpers/chpass-wrapper.py # remove INSTALL doc -%{__rm} INSTALL +rm INSTALL %build %install # install roundcubemail.logrotate -%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d -%{__install} %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -d -m 0755 %{buildroot}/%{_sysconfdir}/logrotate.d +install %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # extract roundcube-framework -%{__install} -d -m 0755 %{buildroot}%{_datadir}/php%{php_major_version} +install -d -m 0755 %{buildroot}/%{_datadir}/php%{php_major_version} mv program/lib/Roundcube %{buildroot}%{_datadir}/php%{php_major_version}/Roundcube # install roundcubemail -%{__install} -d -m 0755 %{buildroot}%{roundcubepath} +install -d -m 0755 %{buildroot}/%{roundcubepath} cp -a * %{buildroot}%{roundcubepath}/ cp %{SOURCE8} %{buildroot}%{roundcubepath}/ -%{__ln_s} %{roundcubepath}/installer %{buildroot}%{roundcubepath}/public_html/installer +ln -s %{roundcubepath}/installer %{buildroot}/%{roundcubepath}/public_html/installer # install config mkdir -p %{buildroot}%{_sysconfdir}/%{name} cp config/* %{buildroot}%{roundcubeconfigpath}/ -%{__install} %{buildroot}%{roundcubeconfigpath}/config.inc.php.sample %{buildroot}%{roundcubeconfigpath}/config.inc.php -%{__rm} -rf %{buildroot}%{roundcubepath}/config -%{__ln_s} %{roundcubeconfigpath} %{buildroot}%{roundcubepath}/config +install %{buildroot}/%{roundcubeconfigpath}/config.inc.php.sample %{buildroot}/%{roundcubeconfigpath}/config.inc.php +rm -rf %{buildroot}/%{roundcubepath}/config +ln -s %{roundcubeconfigpath} %{buildroot}/%{roundcubepath}/config # logs + temp go into /var/ -%{__rm} -rf %{buildroot}%{roundcubepath}/logs \ +rm -rf %{buildroot}/%{roundcubepath}/logs \ %{buildroot}%{roundcubepath}/temp -%{__install} -d %{buildroot}%{_localstatedir}/log/%{name} \ +install -d %{buildroot}/%{_localstatedir}/log/%{name} \ %{buildroot}%{_localstatedir}/lib/%{name} -%{__ln_s} %{_localstatedir}/log/%{name}/ %{buildroot}%{roundcubepath}/logs -%{__ln_s} %{_localstatedir}/lib/%{name}/ %{buildroot}%{roundcubepath}/temp +ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{roundcubepath}/logs +ln -s %{_localstatedir}/lib/%{name}/ %{buildroot}/%{roundcubepath}/temp # move some plugin configs to /etc/roundcubemail for PLUGIN in acl managesieve password; do - if [[ -f %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php.dist ]]; then + if [ -f %{buildroot}/%{roundcubepath}/plugins/$PLUGIN/config.inc.php.dist ]; then mv %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php.dist %{buildroot}%{roundcubeconfigpath}/$PLUGIN.inc.php - %{__ln_s} %{roundcubeconfigpath}/$PLUGIN.inc.php %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php + ln -s %{roundcubeconfigpath}/$PLUGIN.inc.php %{buildroot}/%{roundcubepath}/plugins/$PLUGIN/config.inc.php fi done # install httpd.conf file and adapt the configuration -%{__install} -d -m 0755 %{buildroot}%{apache_sysconfdir}/conf.d +install -d -m 0755 %{buildroot}/%{apache_sysconfdir}/conf.d sed -e "s#__ROUNDCUBEPATH__#%{roundcubepath}#g" %{SOURCE2} > %{buildroot}%{apache_sysconfdir}/conf.d/roundcubemail.conf # install docs -%{__install} -d -m 0755 %{buildroot}%{_defaultdocdir}/%{name} +install -d -m 0755 %{buildroot}/%{_defaultdocdir}/%{name} for i in CHANGELOG UPGRADING LICENSE README.md README.openSUSE SQL; do mv -v %{buildroot}%{roundcubepath}/$i %{buildroot}%{_defaultdocdir}/%{name}/ done # create a link for SQL -%{__ln_s} %{_defaultdocdir}/%{name}/SQL %{buildroot}%{roundcubepath}/SQL +ln -s %{_defaultdocdir}/%{name}/SQL %{buildroot}/%{roundcubepath}/SQL # Make ghost files mkdir %{buildroot}%{roundcubepath}/migrated