Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

@@ -24,7 +24,7 @@
 
 Name:           roundcubemail-plugins-kolab
 Version:        3.2.7
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        Kolab Groupware plugins for Roundcube Webmail
 
 Group:          Applications/Internet
@@ -34,6 +34,8 @@
 Source0:        http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 Source1:        comm.py
 
+Patch1:         fix-php-fatal-error.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
@@ -49,6 +51,7 @@
 Requires:       php-kolab >= 0.5
 Requires:       php-pear(HTTP_Request2)
 Requires:       php-pear(Net_LDAP3)
+Requires:       php-pear(Mail_Mime) >= 1.8.5
 Requires:       roundcubemail >= %{roundcube_version}
 Requires:       roundcubemail(plugin-calendar) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-kolab_activesync) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -653,18 +656,6 @@
 %description -n roundcubemail-plugin-kolab_zpush-skin-classic
 Plugin kolab_zpush / Skin classic
 
-%package -n roundcubemail-plugin-libcalendaring-skin-larry
-Summary:        Plugin libcalendaring / Skin larry
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-larry) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-libcalendaring-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-libcalendaring-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-libcalendaring-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-libcalendaring-skin-larry
-Plugin libcalendaring / Skin larry
-
 %package -n roundcubemail-plugin-owncloud-skin-larry
 Summary:        Plugin owncloud / Skin larry
 Group:          Applications/Internet
@@ -808,6 +799,11 @@
 %package -n roundcubemail-plugin-libcalendaring-skin-larry-assets
 Summary:        Plugin libcalendaring / Skin larry (Assets)
 Group:          Applications/Internet
+Requires:       roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(skin-larry) >= %{roundcube_version}
+Obsoletes:      roundcubemail-plugin-libcalendaring-skin-larry
+Provides:       roundcubemail(plugin-libcalendaring-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-libcalendaring-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-libcalendaring-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-libcalendaring-skin-larry-assets
@@ -839,9 +835,10 @@
 
 %prep
 %setup -q  -c "%{name}-%{version}"
-
 pushd %{name}-%{version}
 
+%patch1 -p1
+
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" -delete
 
@@ -921,8 +918,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"
@@ -1362,6 +1359,20 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
+for dir in $(find /usr/share/roundcubemail/plugins/calendar/ -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
+
+    /usr/share/roundcubemail/bin/updatedb.sh \
+        --dir ${dir} \
+        --package calendar \
+        >/dev/null 2>&1 || :
+done
+
 %posttrans -n roundcubemail-plugin-kolab_activesync
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     if [ -f "%{php_inidir}/apc.ini" ]; then
@@ -1572,6 +1583,20 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
+for dir in $(find /usr/share/roundcubemail/plugins/libkolab/ -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
+
+    /usr/share/roundcubemail/bin/updatedb.sh \
+        --dir ${dir} \
+        --package libkolab \
+        >/dev/null 2>&1 || :
+done
+
 %posttrans -n roundcubemail-plugin-logon_page
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     if [ -f "%{php_inidir}/apc.ini" ]; then
@@ -1662,6 +1687,20 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
+for dir in $(find /usr/share/roundcubemail/plugins/tasklist/ -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
+
+    /usr/share/roundcubemail/bin/updatedb.sh \
+        --dir ${dir} \
+        --package tasklist \
+        >/dev/null 2>&1 || :
+done
+
 %posttrans -n roundcubemail-plugin-tinymce_config
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     if [ -f "%{php_inidir}/apc.ini" ]; then
@@ -1867,9 +1906,6 @@
 %files -n roundcubemail-plugin-kolab_zpush-skin-classic -f plugin-kolab_zpush-skin-classic.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-libcalendaring-skin-larry -f plugin-libcalendaring-skin-larry.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-owncloud-skin-larry -f plugin-owncloud-skin-larry.files
 %defattr(-,root,root,-)
 
@@ -1931,6 +1967,19 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Dec 19 2015 Timotheus Pokorra <tp@tbits.net> - 3.2.7-5
+- dropping roundcubemail-plugin-libcalendaring-skin-larry because it is empty (#5303)
+- rpm 4.13 rejects empty sub packages
+
+* Sun Apr 19 2015 Daniel Hoffend <dh@dotlan.net> - 3.2.7-4
+- fixed check post install database update
+
+* Fri Mar 06 2015 Daniel Hoffend <dh@dotlan.net> - 3.2.7-3
+- Fixed Mail_Mime requirements
+
+* Sat Feb 28 2015 Daniel Hoffend <dh@dotlan.net> - 3.2.7-1
+- Fix PHP Fatal Error when Freebusy is using HTTP Authentication (#4751)
+
 * Wed Feb 25 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2.7-1
 - Release of version 3.2.7

fix-php-5.6.patch Added

fix-php-fatal-error.patch Added

@@ -0,0 +1,25 @@
+From d91d6f98a7f4c03b55d7283873d935fde0b8d50f Mon Sep 17 00:00:00 2001
+From: Daniel Hoffend <dh@dotlan.net>
+Date: Sat, 28 Feb 2015 21:25:30 +0100
+Subject: [PATCH] fixed wrong rc->user call (php fatal error)
+
+---
+ plugins/calendar/drivers/kolab/kolab_user_calendar.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/calendar/drivers/kolab/kolab_user_calendar.php b/plugins/calendar/drivers/kolab/kolab_user_calendar.php
+index 3d53206..1f1d7ac 100644
+--- a/plugins/calendar/drivers/kolab/kolab_user_calendar.php
++++ b/plugins/calendar/drivers/kolab/kolab_user_calendar.php
+@@ -283,7 +283,7 @@ class kolab_user_calendar extends kolab_calendar
+ 
+       // authentication required
+       if ($response->getStatus() == 401) {
+-        $request->setAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION['password']));
++        $request->setAuth($this->cal->rc->user->get_username(), $this->cal->rc->decrypt($_SESSION['password']));
+         $response = $request->send();
+       }
+ 
+-- 
+1.9.1
+

debian.changelog Changed

debian.control Changed

debian.series Changed

roundcubemail-plugins-kolab.dsc Changed

Difference Between Revision 10 and Kolab:3.4 / roundcubemail-plugins-kolab