Kolab Groupware OBS

kolab-freebusy.spec Changed

@@ -35,15 +35,6 @@
 
 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:  roundcubemail(core) >= 1.5
 
 %if 0%{?suse_version}
@@ -51,12 +42,10 @@
 Requires:       php
 %else
 Requires:       webserver
-Requires:       php-common >= 5.3
+Requires:       php-common >= 5.6
 %endif
 
 Requires:       logrotate
-#Requires:       php-Monolog
-Requires:       roundcubemail(core) >= 1.5
 
 %if 0%{?fedora} >= 21
 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
@@ -96,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
 
@@ -112,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 Changed

kolab-freebusy-1.1.2.tar.gz Changed

Changes of Revision 5