Request 3179 (accepted)

Overview

Request 3179 (accepted)

New release with a symlinked vendor directory.

Created by mollekopf 11 months ago
In state accepted
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-freebusy

Submit package Kolab:16:Testing / kolab-freebusy to package Kolab:16 / kolab-freebusy

kolab-freebusy.spec Changed

@@ -30,40 +30,22 @@
 Group:          Applications/Internet
 License:        AGPLv3+
 URL:            http://kolab.org/about/kolab-freebusy
-Source0:        http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 Source1:        kolab-freebusy.logrotate
 
 BuildArch:      noarch
 
-BuildRequires:  composer
-%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
-# have choice for php-composer(justinrainbow/json-schema) < 5 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema php-JsonSchema
-BuildRequires:  php-justinrainbow-json-schema4
-%endif
-
-BuildRequires:  php-Monolog
-BuildRequires:  php-sabre-dav >= 2.1.3
-BuildRequires:  roundcubemail(core)
-BuildRequires:  roundcubemail-plugins-kolab
+BuildRequires:  roundcubemail(core) >= 1.5
 
 %if 0%{?suse_version}
 Requires:       http_daemon
 Requires:       php
 %else
 Requires:       webserver
-Requires:       php-common >= 5.3
+Requires:       php-common >= 5.6
 %endif
 
-Requires:       kolab-utils
 Requires:       logrotate
-Requires:       php-ldap
-Requires:       php-Monolog
-Requires:       php-kolab-net-ldap3
-Requires:       php-sabre-dav >= 2.1.3
-Requires:       roundcubemail(core)
-Requires:       roundcubemail-plugins-kolab
 
 %if 0%{?fedora} >= 21
 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
@@ -77,17 +59,6 @@
 %prep
 %setup -q
 
-%build
-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
-
 %install
 mkdir -p \
     %{buildroot}/%{_ap_sysconfdir}/conf.d/ \
@@ -114,7 +85,7 @@
 popd
 
 cp -a public_html %{buildroot}/%{_datadir}/%{name}/public_html
-cp -a vendor %{buildroot}/%{_datadir}/%{name}/vendor
+ln -s ../roundcubemail/vendor vendor
 
 cp -a config/config.ini.sample %{buildroot}/%{_sysconfdir}/%{name}/config.ini
 
@@ -130,6 +101,12 @@
 
 find %{buildroot}/%{_datadir}/%{name} -type f -name ".*" -delete
 
+%pretrans
+# upgrade path for `vendor` directory -> symlink change. It's a vendor directory, so we don't do the rpmmoved dance.
+if  -d "/usr/share/kolab-freebusy/vendor" -a ! -L "/usr/share/kolab-freebusy/vendor" ; then
+    rm -rf /usr/share/kolab-freebusy/vendor
+fi
+
 %pre
 # This is replaced by an actual directory
 if  -L "%{_datadir}/kolab-freebusy/config" ; then

buildtarball.sh Added

debian.control Changed

kolab-freebusy-1.1.2.tar.gz/composer.json Changed

kolab-freebusy-1.1.2.tar.gz/config/config.ini.sample Changed

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/HTTPAuth.php Changed

Build Results
RPM Lint

Refresh

Comments for request 3179 0

Request History

mollekopf created request 11 months ago

New release with a symlinked vendor directory.

mollekopf accepted request 11 months ago