Request 901 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

This request supersedes: request 900 (Show diff)

Overview

Request 901 (accepted)

Fix quoting SQL

Created by vanmeeuwen almost 10 years ago
In state accepted
Supersedes 900

Submit roundcubemail

Submit package Kolab:Development / roundcubemail to package Kolab:3.4:Updates / roundcubemail

roundcubemail.spec Changed

@@ -41,9 +41,9 @@
 %global tmpdir /var/lib/roundcubemail
 
 Name:           roundcubemail
-Version:        1.1.0
+Version:        1.1.1.3
 
-Release:        4%{?dist}
+Release:        1%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -64,10 +64,15 @@
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
+BuildRequires:  php-Net-LDAP3
+BuildRequires:  php-pdo
+BuildRequires:  php-phpunit-PHPUnit
+
 %if 0%{?suse_version} < 1
 BuildRequires:  python-cssmin
 BuildRequires:  uglify-js
 %endif
+
 BuildRequires:  python
 
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -1363,8 +1368,8 @@
         echo "    touch %%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
         echo "fi"
         echo ""
-        if [ ! -z "$(find ${plugin} -type d -name \"SQL\")" ]; then
-            echo "for dir in \$(find /usr/share/roundcubemail/plugins/$(basename $plugin)/ -type d -name \"SQL\"); do"
+        if [ ! -z "$(find ${plugin} -type d -name SQL)" ]; then
+            echo "for dir in \$(find /usr/share/roundcubemail/plugins/$(basename $plugin)/ -type d -name SQL); do"
             echo "    # Skip plugins with multiple drivers and no kolab driver"
             echo "    if [ ! -z \"\$(echo \$dir | grep driver)\" ]; then"
             echo "        if [ -z \"\$(echo \$dir | grep kolab)\" ]; then"
@@ -1932,6 +1937,11 @@
     %{__rm} -rf %{plugindir}/enigma/home >/dev/null 2>&1 || :
 fi
 
+%check
+pushd %{name}-%{version}/tests
+phpunit --debug || :
+popd
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -2989,6 +2999,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Mar 27 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.1.1.3-1
+- Check in 3 revisions ahead of 1.1.1 release
+
 * Wed Feb 25 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.1.0-4
 - Repack of 1.1 release branch at bbbd02bd

debian.changelog Changed

roundcubemail-1.1.0.tar.gz -> roundcubemail-1.1.1.3.tar.gz Changed

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 901 0

Request History

vanmeeuwen created request almost 10 years ago

Fix quoting SQL

dhoffend accepted request almost 10 years ago