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

Overview

Request 59 (accepted)

Roundcube kolab plugins 3.1.1 for Kolab 3.1

Created by vanmeeuwen about 11 years ago
In state accepted

Submit roundcubemail-plugins-kolab

Submit package home:vanm...elopment / roundcube...ns-kolab to package Kolab:Development / roundcubem...gins-kolab

roundcubemail-plugins-kolab.spec Changed

@@ -1,3 +1,11 @@
+%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
+
+%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
+%global with_systemd 0
+%else
+%global with_systemd 1
+%endif
+
 %global roundcube %{_datadir}/roundcubemail
 %global roundcube_plugins %{roundcube}/plugins
 %global roundcube_conf %{_sysconfdir}/roundcubemail
@@ -5,32 +13,25 @@
 %global roundcube_lib %{_var}/lib/roundcubemail
 
 Name:       roundcubemail-plugins-kolab
-Version:    3.0.1
-Release:    2%{?dist}
+Version:    3.1.1
+Release:    1%{?dist}
 Summary:    Kolab Groupware plugins for Roundcube Webmail
 
 Group:      Applications/Internet
 License:    AGPLv3+ and GPLv3+
 URL:        http://www.kolab.org
 
-Source0:    http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
+# Snapshot from http://git.kolab.org/roundcubemail-plugins-kolab/snapshot/1999f794461c6a9447e58bdcd89de98a72a9dfd1.tar.gz
+#Source0:    http://git.kolab.org/%{name}/snapshot/%{name}-%{version}.tar.gz
+Source0:    http://git.kolab.org/%{name}/snapshot/%{name}-%{version}.tar.gz
 Source1:    kolab_logo.png
 
-Patch1:     roundcubemail-plugins-kolab-3.0.1-identity-organization-field-null.patch
-
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:  noarch
 
-Requires:   php-kolab >= 0.4
-Requires:   php-kolabformat >= 0.7
-
-%if 0%{?suse_version}
-Requires:   php5-pear-HTTP_Request2
-%else
+Requires:   php-kolabformat >= 1.0
 Requires:   php-pear(HTTP_Request2)
-%endif
-
-Requires:   roundcubemail >= 0.9
+Requires:   roundcubemail >= 1.0
 Obsoletes:  roundcubemail-kolab < %{version}-%{release}
 Provides:   roundcubemail-kolab = %{version}-%{release}
 
@@ -38,9 +39,8 @@
 A collection of Kolab Groupware plugins for Roundcube Webmail
 
 %prep
-%setup -q
-
-%patch1 -p1
+#%setup -q
+%setup -q -n %{name}-%{version}
 
 %build
 
@@ -50,6 +50,7 @@
     %{buildroot}%{roundcube_conf} \
     %{buildroot}%{roundcube_plugins}
 cp -a plugins/* %{buildroot}%{roundcube_plugins}
+rm -rf %{buildroot}%{roundcube_plugins}/kolab_zpush
 
 mkdir -p %{buildroot}%{roundcube}/skins/kolab/images
 install -pm 644 %{SOURCE1} %{buildroot}%{roundcube}/skins/kolab/images/kolab_logo.png
@@ -79,6 +80,12 @@
 ln -s ../../../../..%{roundcube_conf}/kolab_delegation.inc.php config.inc.php
 popd
 
+# Kolab files plugin
+mv %{buildroot}%{roundcube_plugins}/kolab_files/config.inc.php.dist %{buildroot}%{roundcube_conf}/kolab_files.inc.php
+pushd %{buildroot}%{roundcube_plugins}/kolab_files/
+ln -s ../../../../..%{roundcube_conf}/kolab_files.inc.php config.inc.php
+popd
+
 # Kolab folders plugin
 mv %{buildroot}%{roundcube_plugins}/kolab_folders/config.inc.php.dist %{buildroot}%{roundcube_conf}/kolab_folders.inc.php
 pushd %{buildroot}%{roundcube_plugins}/kolab_folders/
@@ -97,6 +104,12 @@
 ln -s ../../../../..%{roundcube_conf}/ldap_authentication.inc.php config.inc.php
 popd
 
+# Logon page plugin
+mv %{buildroot}%{roundcube_plugins}/logon_page/logon_page.html %{buildroot}%{roundcube_conf}/logon_page.html
+pushd %{buildroot}%{roundcube_plugins}/logon_page/
+ln -s ../../../../..%{roundcube_conf}/logon_page.html logon_page.html
+popd
+
 # odfviewer plugin
 mkdir -p %{buildroot}%{roundcube_lib}/plugins/odfviewer
 pushd %{buildroot}%{roundcube_plugins}/odfviewer/
@@ -122,72 +135,89 @@
 ln -s ../../../../..%{roundcube_conf}/tasklist.inc.php config.inc.php
 popd
 
-cat >> %{buildroot}%{roundcube_lib}/plugins/odfviewer/.htaccess << EOF
-<IfModule mod_deflate.c>
-    SetOutputFilter NONE
-</IfModule>
-
-Options -Indexes
-EOF
-
 %post
 if [ -f "%{php_inidir}/apc.ini" ]; then
     if [ ! -z "`grep apc.enabled=1 %{php_inidir}/apc.ini`" ]; then
-%if 0%{?fedora} > 15
-        /sbin/systemctl condrestart httpd.service
+%if 0%{?with_systemd}
+        /sbin/systemctl condrestart %{httpd_name}.service
 %else
-    /sbin/service httpd condrestart
+        /sbin/service %{httpd_name} condrestart
 %endif
     fi
 fi
 
+for plugin in calendar kolab_activesync kolab_addressbook \
+        kolab_auth kolab_config kolab_delegation kolab_files \
+        kolab_folders libkolab libcalendaring odfviewer \
+        owncloud piwik_analytics tasklist; do
+
+    for dir in `find /usr/share/roundcubemail/plugins/ -type d -name "SQL"`; do
+        /usr/share/roundcubemail/bin/updatedb.sh \
+            --dir $dir \
+            --package ${plugin} \
+            >/dev/null 2>&1 || :
+    done
+done
+
+exit 0
+
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%if 0%{?suse_version}
 %dir %{roundcube_conf}
-%attr(0640,apache,apache) %config(noreplace) %{roundcube_conf}/*.php
 %dir %{roundcube}
+%dir %{roundcube_plugins}
+%endif
+%attr(0640,apache,apache) %config(noreplace) %{roundcube_conf}/*.php
+%attr(0640,apache,apache) %config(noreplace) %{roundcube_conf}/logon_page.html
 %dir %{roundcube}/skins/
 %dir %{roundcube}/skins/kolab/
 %dir %{roundcube}/skins/kolab/images/
 %{roundcube}/skins/kolab/images/kolab_logo.png
-%dir %{roundcube_plugins}
 %{roundcube_plugins}/calendar
 %{roundcube_plugins}/kolab_activesync
 %{roundcube_plugins}/kolab_addressbook
 %{roundcube_plugins}/kolab_auth
 %{roundcube_plugins}/kolab_config
 %{roundcube_plugins}/kolab_delegation
+%{roundcube_plugins}/kolab_files
 %{roundcube_plugins}/kolab_folders
-%{roundcube_plugins}/kolab_zpush
 %{roundcube_plugins}/ldap_authentication
 %{roundcube_plugins}/libkolab
 %{roundcube_plugins}/libcalendaring
 %{roundcube_plugins}/logon_page
 %{roundcube_plugins}/odfviewer
 %{roundcube_plugins}/owncloud
+%{roundcube_plugins}/pdfviewer
 %{roundcube_plugins}/piwik_analytics
 %{roundcube_plugins}/tasklist
 %{roundcube_plugins}/tinymce_config
 %dir %{roundcube_lib}
 %dir %{roundcube_lib}/plugins
 %attr(0750,apache,apache) %{roundcube_lib}/plugins/odfviewer
-%config(noreplace) %{roundcube_lib}/plugins/odfviewer/.htaccess
 
 %changelog
-* Thu Feb 14 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.0.1-2
-- Ship fix for organization field in delegation's identity management
-- Correct .htaccess not being shipped as part of the odfviewer plugin
+* Sun Aug 25 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1.1-1
+- Release 3.1.1 with bugfixes
+
+* Thu Aug  8 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1.0-1
+- Release 3.1.0 after initial round of bug fixing
+
+* Fri Jul 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1-0.6
+- A new snapshot with enhanced domain discoery for kolab_auth
 
-* Wed Jan  9 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.0.1-1
-- Upstream release
+* Wed May  8 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1-0.5
+- Correct kolab_files configuration
+- Ship new snapshot
+- Fix apc.ini grep problem
 
-* Tue Nov 20 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.0-0.27.git20121203.df15df9c
-- Ship new snapshot (0.27)
-- Include requirement for php-kolab (0.26)
-- New snapshot (0.22 - 0.25)
+* Wed Oct 17 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.0-0.24.git20121017.7a8916c2
+- New snapshot (0.24)
+- New snapshot (0.23)
+- New snapshot (0.22)
 - Ship activesync plugin (0.19)
 - Require php-pear(HTTP_Request2) (0.19)
 - Ship Kolab logo (0.17)

debian.changelog Changed

debian.control Changed

roundcubemail-plugins-kolab-3.0.1.tar.gz -> roundcubemail-plugins-kolab-3.1.1.tar.gz Changed

roundcubemail-plugins-kolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 59 0

Request History

vanmeeuwen created request about 11 years ago

Roundcube kolab plugins 3.1.1 for Kolab 3.1

vanmeeuwen accepted request about 11 years ago