Kolab Groupware OBS

Changes of Revision 2

kolab-webadmin.spec Changed

@@ -51,15 +51,24 @@
 
 %if 0%{?suse_version}
 Requires:       http_daemon
+Recommends:     mod_php_any
 %else
 Requires:       webserver
 %endif
 
-%if 0%{?rhel} < 8
 Requires:       mozldap-tools
+Requires:       php-Smarty >= 3.1.7
+Requires:       php-pear(HTTP_Request2)
+%if 0%{?suse_version}
+Requires:       php-pear-Mail
 %else
-Requires:       openldap-clients
+Requires:       php-pear(Mail)
 %endif
+Requires:       php-pear(Net_Socket)
+Requires:       php-pear(Net_LDAP2)
+Requires:       php-kolab-net-ldap3
+Requires:       php-pear(Net_SMTP)
+Requires:       php-pear(Net_URL2)
 Requires:       php-gettext
 Requires:       php-ldap
 Requires:       php-mbstring
@@ -81,13 +90,6 @@
 
 %build
 
-%if 0%{?rhel} >= 8
-#Mod php has been deprecated and the php_ options no longer work
-sed -i '/php_/s/^/#/' doc/kolab-webadmin.conf
-sed -i '/php_/s/^/#/' doc/hosted-kolab.conf
-rm public_html/api/.htaccess
-%endif
-
 %install
 mkdir -p \
     %{buildroot}/%{_datadir}/%{name}/ \
@@ -99,7 +101,7 @@
 rm -rf lib/ext/
 
 cp -a bin %{buildroot}/%{_datadir}/%{name}/.
-cp -a vendor/ lib/ public_html/ hosted/ %{buildroot}/%{_datadir}/%{name}/.
+cp -a lib/ public_html/ hosted/ %{buildroot}/%{_datadir}/%{name}/.
 cp -a doc/kolab-webadmin.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/
 cp -a doc/hosted-kolab.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/
 pushd %{buildroot}/%{_datadir}/%{name}/

buildtarball.sh Deleted

@@ -1,75 +0,0 @@
-#!/bin/bash
-
-set -e
-
-VERSION=3.2.16
-GIT_REF=master
-NAME=kolab-webadmin-$VERSION
-
-if  -x "/usr/local/bin/lessc" ; then
-    LESSC=/usr/local/bin/lessc
-else
-    LESSC=~/node_modules/less/bin/lessc
-fi
-
-
-ROOT_DIR=$(pwd)
-
-rm -Rf /tmp/$NAME
-mkdir /tmp/$NAME
-cd /tmp/$NAME
-
-cat << EOF > ./composer.json
-{
-    "name": "kolab/webadmin",
-    "description": "The Kolab Web Administration Panel",
-    "license": "AGPL-3.0+",
-    "repositories": 
-        {
-            "type": "vcs",
-            "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
-        }
-    ,
-    "require": {
-        "php": ">=5.4.0",
-        "pear/pear-core-minimal": "~1.10.1",
-        "pear/http_request2": "~2.3.0",
-        "pear/mail": "~1.4.1",
-        "pear/net_smtp": "~1.7.3",
-        "pear/net_ldap2": "~2.2.0",
-        "kolab/net_ldap3": "dev-master",
-        "smarty/smarty": "~3.1.31"
-    }
-}
-EOF
-
-rm -f $NAME.tar.gz
- -d "$NAME"  && rm -rf "$NAME"
-git clone --branch master ssh://git@git.kolab.org/diffusion/WAP/webadmin.git $NAME
-pushd $NAME
-git reset --hard $GIT_REF
-popd
-
-
-# Run composer and other install processes
-mv composer.json $NAME/composer.json
-pushd $NAME
-composer install
-popd
-
-# cat << EOF > ./phpstan.neon
-# parameters:
-#     level: 1
-#     parallel:
-#         processTimeout: 300.0
-#     paths:
-#         - app/
-# EOF
-
-# php -dmemory_limit=500M vendor/bin/phpstan analyse
-
-# popd
-
-tar --exclude="$NAME/.git" -czf "$ROOT_DIR/$NAME.tar.gz" $NAME
-
-cd "$PWD"

kolab-webadmin-3.2.16.tar.gz Changed