Request 3159 (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.

You're not reviewing the full diff of request 3159 , but the diff to the superseded request 3155 (Show full diff)

Overview

Request 3159 (accepted)

New release

Created by mollekopf over 1 year ago
In state accepted
Supersedes 3155
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit roundcubemail-selfcontained

Submit package Kolab:16:Testing / roundcubema...fcontained to package Kolab:16 / roundcubemail-selfcontained

roundcubemail.spec Changed

@@ -48,16 +48,15 @@
 %global logdir /var/log/roundcubemail
 %global tmpdir /var/lib/roundcubemail
 
-%global rc_version 1.5
+%global rc_version 1.5.3
 %global plugin_version 3.5.11
 %global skin_version 0.5.0
 #%%global rc_rel_suffix rc2.12
 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
-%global basedir %{name}-%{rc_version}%{?dash_rel_suffix}
 
 Name:           roundcubemail
-Version:        %{rc_version}.4
+Version:        %{rc_version}
 
 Release:        4%{?dot_rel_suffix}%{?dist}
 
@@ -67,7 +66,7 @@
 License:        GPLv2
 URL:            http://www.roundcube.net
 
-Source0:        roundcubemail-%{rc_version}.tar.gz
+Source0:        roundcubemail-%{version}%{?dash_rel_suffix}.tar.gz
 
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
@@ -284,9 +283,9 @@
 Roundcube Webmail for Kolab
 
 %prep
-%setup -q -c "%{basedir}"
+%setup -q -c "%{name}-%{version}%{?dash_rel_suffix}"
 
-pushd %{basedir}
+pushd %{name}-%{version}%{?dash_rel_suffix}
 
 cp -vf "%{SOURCE200}" SQL/mysql/
 rm -rvf SQL/mysql/2016081200.sql
@@ -352,9 +351,9 @@
 rm -rf plugins/password/helpers/chpass-wrapper.py
 popd
 
-cp -a %{basedir}/{CHANGELOG.md,LICENSE,README.md} .
+cp -a %{name}-%{version}%{?dash_rel_suffix}/{CHANGELOG.md,LICENSE,README.md} .
 
-rm -rf %{basedir}/plugins/jqueryui/themes/redmond
+rm -rf %{name}-%{version}%{?dash_rel_suffix}/plugins/jqueryui/themes/redmond
 
 
 %build
@@ -373,7 +372,7 @@
     %{buildroot}%{tmpdir}/plugins \
     %{buildroot}%{tmpdir}/plugins/enigma
 
-pushd %{basedir}
+pushd %{name}-%{version}%{?dash_rel_suffix}
 
 %if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
@@ -422,8 +421,8 @@
 
 %{__mkdir_p} ${asset_path}
 
-orig_dir="%{basedir}"
-asset_dir="%{basedir}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
+orig_dir="%{name}-%{version}%{?dash_rel_suffix}"
+asset_dir="%{name}-%{version}%{?dash_rel_suffix}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
 
 # Remove the skins and installer directories from ${orig_dir}
 #TODO?
@@ -493,7 +492,7 @@
 
 
 %check
-pushd %{basedir}/tests
+pushd %{name}-%{version}%{?dash_rel_suffix}/tests
 phpunit --debug || :
 popd
 
@@ -567,29 +566,42 @@
 # Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
 ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
     --dir %{_datadir}/doc/roundcubemail-%{version}/SQL/ \
-    --package roundcube || :
+    --package roundcube || : \
+    >/dev/null 2>&1
 %else
 php="/usr/bin/php"
 ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
     --dir %{_datadir}/doc/roundcubemail/SQL/ \
-    --package roundcube || :
+    --package roundcube || : \
+    >/dev/null 2>&1
 %endif
 
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/roundcubemail/plugins/libkolab/SQL/ \
-    --package libkolab || :
 
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/roundcubemail/plugins/calendar/drivers/kolab/SQL/ \
-    --package calendar-kolab || :
+for plugin in $(find /usr/share/roundcubemail/plugins -mindepth 1 -maxdepth 1 -type d | sort); do
+    if  ! -z "$(find ${plugin} -type d -name SQL)" ; then
+        for dir in $(find /usr/share/roundcubemail/plugins/$(basename ${plugin})/ -type d -name SQL); do
+            # Skip plugins with multiple drivers and no kolab driver
+            if  ! -z "$(echo $dir | grep driver)" ; then
+                if  -z "$(echo $dir | grep kolab)" ; then
+                    continue
+                fi
+            fi
+
+            ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
+                --dir $dir \
+                --package $(basename ${plugin}) \
+                >/dev/null 2>&1 || :
+        done
+    fi
+done
 
 exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc %{basedir}/LICENSE
-%doc %{basedir}/UPGRADING
-%doc %{basedir}/SQL
+%doc %{name}-%{version}%{?dash_rel_suffix}/LICENSE
+%doc %{name}-%{version}%{?dash_rel_suffix}/UPGRADING
+%doc %{name}-%{version}%{?dash_rel_suffix}/SQL
 
 %{_datadir}/%{name}/
 %{_sharedstatedir}/%{name}/

buildroundcubemailtarball.sh Changed

@@ -3,8 +3,8 @@
 set -e
 set -x
 
-VERSION=1.5
-GIT_REF=dev/kolab-$VERSION
+VERSION=1.5.3
+GIT_REF=dev/kolab-1.5
 PLUGINS_GIT_REF=master
 NAME=roundcubemail-$VERSION
 source buildroundcubemailtarball.config
@@ -139,34 +139,6 @@
             }
         },
         {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_2fa",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/logon_page",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/nextcloud_link",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_sso",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
             "type": "composer",
             "url": "https://plugins.roundcube.net"
         }
@@ -200,10 +172,6 @@
         "kolab/odfviewer": "~3.4.0",
         "kolab/pdfviewer": "~3.4.0",
         "kolab/tasklist": "~3.5.10",
-        "kolab/kolab_2fa": "~3.5.11",
-        "kolab/kolab_sso": "~3.5.4",
-        "kolab/logon_page": "~3.4.2",
-        "kolab/nextcloud_link": "~1.0",
         "johndoh/contextmenu": "~3.2.1",
         "zf1/zend-json": "~1.12.11",
         "zf1/zend-log": "~1.12.11",

debian.changelog Changed

roundcubemail-1.5.tar.gz -> roundcubemail-1.5.3.tar.gz Changed

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3159 0

Request History

mollekopf created request over 1 year ago

New release

mollekopf accepted request over 1 year ago