Request 2892 (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 2892 (accepted)

Check in 0.4.6 vendorize sabre

Created by vanmeeuwen over 2 years ago
In state accepted

Submit iRony

Submit package Kolab:Winterfell / iRony to package Kolab:16 / iRony

iRony.spec Changed

@@ -37,7 +37,7 @@
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:           iRony
-Version:        0.4.5
+Version:        0.4.6
 Release:	    1%{?dist}
 Summary:        DAV for Kolab Groupware
 
@@ -53,12 +53,6 @@
 BuildArch:      noarch
 
 Requires:       chwala >= 0.5.2
-%if 0%{?rhel} < 8
-Requires:       php-sabre-dav >= 2.1.11
-Requires:       php-sabre-event >= 2.0.2
-Requires:       php-sabre-http >= 3.0.5
-Requires:       php-sabre-vobject >= 3.5.3
-%endif
 Requires:       roundcubemail(core) >= 1.3
 %if 0%{?plesk} < 1
 Requires:       roundcubemail-plugin-kolab_auth >= 3.3.6
@@ -109,19 +103,6 @@
 %setup -q
 
 %build
-rm -rvf vendor/sabre
-
-%if 0%{?rhel} < 8
-rm -rf composer.json
-mv composer.json-dist composer.json
-mkdir -p $HOME/.composer/
-echo '{}' > $HOME/.composer/composer.json
-%if 0%{?fedora} >= 25
-# workaround for misbehaving Kolab modules for PHP7, probably a swig issue
-export USE_ZEND_ALLOC=0
-%endif
-composer -vvv dumpautoload --optimize
-%endif
 
 %install
 mkdir -p \
@@ -162,6 +143,11 @@
 ln -s ../../../..%{_sysconfdir}/roundcubemail/config.inc.php
 popd
 
+%if 0%{?rhel} < 8
+rm -rf vendor
+ln -s ../roundcubemail/vendor vendor
+%endif
+
 rm -rf lib/Roundcube
 pushd lib/
 ln -s ../../chwala/lib FileAPI
@@ -185,8 +171,8 @@
 %if 0%{?plesk} < 1
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
 %endif
-%attr(0750,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
-%attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/dav.inc.php
+%attr(0755,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
+%attr(0644,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/dav.inc.php
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_datadir}/%{name}
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/cache/%{name}
@@ -194,6 +180,10 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Sat Dec 25 2020 Christian Mollekopf <mollekopf@kolabsys.com> - 0.4.5-2
+- Fixed configuration directory permissions
+- Link to roundcubemail vendor directory in ootpa
+
 * Mon Oct 19 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.5-1
 - Release of version 0.4.5