Kolab Groupware OBS

Changes of Revision 3

kolab-freebusy.spec Changed

@@ -35,9 +35,7 @@
 
 BuildArch:      noarch
 
-%if 0%{?rhel} < 8 || 0%{?fedora}
 BuildRequires:  composer
-%endif
 %if 0%{?fedora}
 # fix issue:
 # have choice for php-composer(justinrainbow/json-schema) >= 2.0 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema
@@ -45,12 +43,11 @@
 BuildRequires:  php-justinrainbow-json-schema4
 %endif
 
-%if 0%{?rhel} < 8 || 0%{?fedora}
 BuildRequires:  php-Monolog
 BuildRequires:  php-sabre-dav >= 2.1.3
-%endif
 BuildRequires:  roundcubemail(core)
-BuildRequires:  roundcubemail-plugins-kolab
+BuildRequires:  roundcubemail-plugin-libcalendaring
+BuildRequires:  roundcubemail-plugin-libkolab
 
 %if 0%{?suse_version}
 Requires:       http_daemon
@@ -60,16 +57,17 @@
 Requires:       php-common >= 5.3
 %endif
 
-Requires:       kolab-utils
 Requires:       logrotate
-%if 0%{?rhel} < 8 || 0%{?fedora}
+%if 0%{?plesk}
+%else
 Requires:       php-ldap
-Requires:       php-Monolog
 Requires:       php-kolab-net-ldap3
-Requires:       php-sabre-dav >= 2.1.3
 %endif
+Requires:       php-Monolog
+Requires:       php-sabre-dav >= 2.1.3
 Requires:       roundcubemail(core)
-Requires:       roundcubemail-plugins-kolab
+BuildRequires:  roundcubemail-plugin-libcalendaring
+BuildRequires:  roundcubemail-plugin-libkolab
 
 %if 0%{?fedora} >= 21
 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
@@ -84,7 +82,6 @@
 %setup -q
 
 %build
-%if 0%{?rhel} < 8 || 0%{?fedora}
 rm -rf composer.json
 mv composer.json-dist composer.json
 mkdir -p $HOME/.composer/
@@ -94,7 +91,6 @@
 export USE_ZEND_ALLOC=0
 %endif
 composer -vvv dumpautoload --optimize
-%endif
 
 %install
 mkdir -p \
@@ -122,9 +118,7 @@
 popd
 
 cp -a public_html %{buildroot}/%{_datadir}/%{name}/public_html
-%if 0%{?rhel} < 8
 cp -a vendor %{buildroot}/%{_datadir}/%{name}/vendor
-%endif
 
 cp -a config/config.ini.sample %{buildroot}/%{_sysconfdir}/%{name}/config.ini

debian.control Changed