Kolab Groupware OBS

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.

Changes of Revision 62

roundcubemail-plugins-kolab.spec Changed

@@ -17,10 +17,10 @@
 %endif
 
 %global roundcube %{_datadir}/roundcubemail
-%global roundcube_plugins %{roundcube}/plugins
-%global roundcube_conf %{_sysconfdir}/roundcubemail
+%global plugindir %{roundcube}/plugins
+%global confdir %{_sysconfdir}/roundcubemail
 %global roundcube_log %{_var}/log/roundcubemail
-%global roundcube_lib %{_var}/lib/roundcubemail
+%global tmpdir %{_var}/lib/roundcubemail
 
 Name:           roundcubemail-plugins-kolab
 Version:        3.2
@@ -69,135 +69,146 @@
 
 %install
 rm -rf %{buildroot}
-mkdir -p \
-    %{buildroot}%{roundcube_conf} \
-    %{buildroot}%{roundcube_plugins}
-cp -a plugins/* %{buildroot}%{roundcube_plugins}
+%{__install} -d \
+    %{buildroot}%{confdir} \
+    %{buildroot}%{plugindir}
+cp -a plugins/* %{buildroot}%{plugindir}
 
-rm -rf %{buildroot}%{roundcube_plugins}/kolab_zpush
-rm -rf %{buildroot}%{roundcube_plugins}/kolab_zpush
-
-mkdir -p %{buildroot}%{roundcube}/skins/kolab/images
-install -pm 644 %{SOURCE1} %{buildroot}%{roundcube}/skins/kolab/images/kolab_logo.png
+rm -rf %{buildroot}%{plugindir}/kolab_zpush
 
 # Calendar
-mv %{buildroot}%{roundcube_plugins}/calendar/config.inc.php.dist %{buildroot}%{roundcube_conf}/calendar.inc.php
-rm -rf %{buildroot}%{roundcube_plugins}/calendar/config.inc.php
-pushd %{buildroot}%{roundcube_plugins}/calendar/
-ln -s ../../../../..%{roundcube_conf}/calendar.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/calendar/config.inc.php.dist %{buildroot}%{confdir}/calendar.inc.php
+rm -rf %{buildroot}%{plugindir}/calendar/config.inc.php
+pushd %{buildroot}%{plugindir}/calendar/
+ln -s ../../../../..%{confdir}/calendar.inc.php config.inc.php
 popd
 
 # Kolab address book plugin
-mv %{buildroot}%{roundcube_plugins}/kolab_addressbook/config.inc.php.dist %{buildroot}%{roundcube_conf}/kolab_addressbook.inc.php
-pushd %{buildroot}%{roundcube_plugins}/kolab_addressbook/
-ln -s ../../../../..%{roundcube_conf}/kolab_addressbook.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/kolab_addressbook/config.inc.php.dist %{buildroot}%{confdir}/kolab_addressbook.inc.php
+pushd %{buildroot}%{plugindir}/kolab_addressbook/
+ln -s ../../../../..%{confdir}/kolab_addressbook.inc.php config.inc.php
 popd
 
 # Kolab auth plugin
-mv %{buildroot}%{roundcube_plugins}/kolab_auth/config.inc.php.dist %{buildroot}%{roundcube_conf}/kolab_auth.inc.php
-pushd %{buildroot}%{roundcube_plugins}/kolab_auth/
-ln -s ../../../../..%{roundcube_conf}/kolab_auth.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/kolab_auth/config.inc.php.dist %{buildroot}%{confdir}/kolab_auth.inc.php
+pushd %{buildroot}%{plugindir}/kolab_auth/
+ln -s ../../../../..%{confdir}/kolab_auth.inc.php config.inc.php
 popd
 
 # Kolab delegation plugin
-mv %{buildroot}%{roundcube_plugins}/kolab_delegation/config.inc.php.dist %{buildroot}%{roundcube_conf}/kolab_delegation.inc.php
-pushd %{buildroot}%{roundcube_plugins}/kolab_delegation/
-ln -s ../../../../..%{roundcube_conf}/kolab_delegation.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/kolab_delegation/config.inc.php.dist %{buildroot}%{confdir}/kolab_delegation.inc.php
+pushd %{buildroot}%{plugindir}/kolab_delegation/
+ln -s ../../../../..%{confdir}/kolab_delegation.inc.php config.inc.php
 popd
 
 # Kolab files plugin
-mv %{buildroot}%{roundcube_plugins}/kolab_files/config.inc.php.dist %{buildroot}%{roundcube_conf}/kolab_files.inc.php
-pushd %{buildroot}%{roundcube_plugins}/kolab_files/
-ln -s ../../../../..%{roundcube_conf}/kolab_files.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/kolab_files/config.inc.php.dist %{buildroot}%{confdir}/kolab_files.inc.php
+pushd %{buildroot}%{plugindir}/kolab_files/
+ln -s ../../../../..%{confdir}/kolab_files.inc.php config.inc.php
 popd
 
 # Kolab folders plugin
-mv %{buildroot}%{roundcube_plugins}/kolab_folders/config.inc.php.dist %{buildroot}%{roundcube_conf}/kolab_folders.inc.php
-pushd %{buildroot}%{roundcube_plugins}/kolab_folders/
-ln -s ../../../../..%{roundcube_conf}/kolab_folders.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/kolab_folders/config.inc.php.dist %{buildroot}%{confdir}/kolab_folders.inc.php
+pushd %{buildroot}%{plugindir}/kolab_folders/
+ln -s ../../../../..%{confdir}/kolab_folders.inc.php config.inc.php
 popd
 
 # libkolab plugin
-mv %{buildroot}%{roundcube_plugins}/libkolab/config.inc.php.dist %{buildroot}%{roundcube_conf}/libkolab.inc.php
-pushd %{buildroot}%{roundcube_plugins}/libkolab/
-ln -s ../../../../..%{roundcube_conf}/libkolab.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/libkolab/config.inc.php.dist %{buildroot}%{confdir}/libkolab.inc.php
+pushd %{buildroot}%{plugindir}/libkolab/
+ln -s ../../../../..%{confdir}/libkolab.inc.php config.inc.php
 popd
 
 # LDAP Authentication plugin
-mv %{buildroot}%{roundcube_plugins}/ldap_authentication/config.inc.php.dist %{buildroot}%{roundcube_conf}/ldap_authentication.inc.php
-pushd %{buildroot}%{roundcube_plugins}/ldap_authentication/
-ln -s ../../../../..%{roundcube_conf}/ldap_authentication.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/ldap_authentication/config.inc.php.dist %{buildroot}%{confdir}/ldap_authentication.inc.php
+pushd %{buildroot}%{plugindir}/ldap_authentication/
+ln -s ../../../../..%{confdir}/ldap_authentication.inc.php config.inc.php
 popd
 
 # Logon page plugin
-mv %{buildroot}%{roundcube_plugins}/logon_page/logon_page.html %{buildroot}%{roundcube_conf}/logon_page.html
-pushd %{buildroot}%{roundcube_plugins}/logon_page/
-ln -s ../../../../..%{roundcube_conf}/logon_page.html logon_page.html
+mv %{buildroot}%{plugindir}/logon_page/logon_page.html %{buildroot}%{confdir}/logon_page.html
+pushd %{buildroot}%{plugindir}/logon_page/
+ln -s ../../../../..%{confdir}/logon_page.html logon_page.html
 popd
 
 # odfviewer plugin
-mkdir -p %{buildroot}%{roundcube_lib}/plugins/odfviewer
-pushd %{buildroot}%{roundcube_plugins}/odfviewer/
+mkdir -p %{buildroot}%{tmpdir}/plugins/odfviewer
+pushd %{buildroot}%{plugindir}/odfviewer/
 rm -rf files
-ln -s ../../../../..%{roundcube_lib}/plugins/odfviewer files
+ln -s ../../../../..%{tmpdir}/plugins/odfviewer files
 popd
 
 # owncloud plugin
-mv %{buildroot}%{roundcube_plugins}/owncloud/config.inc.php.dist %{buildroot}%{roundcube_conf}/owncloud.inc.php
-pushd %{buildroot}%{roundcube_plugins}/owncloud/
-ln -s ../../../../..%{roundcube_conf}/owncloud.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/owncloud/config.inc.php.dist %{buildroot}%{confdir}/owncloud.inc.php
+pushd %{buildroot}%{plugindir}/owncloud/
+ln -s ../../../../..%{confdir}/owncloud.inc.php config.inc.php
 popd
 
 # Piwik Analytics plugin
-mv %{buildroot}%{roundcube_plugins}/piwik_analytics/config.inc.php.dist %{buildroot}%{roundcube_conf}/piwik_analytics.inc.php
-pushd %{buildroot}%{roundcube_plugins}/piwik_analytics/
-ln -s ../../../../..%{roundcube_conf}/piwik_analytics.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/piwik_analytics/config.inc.php.dist %{buildroot}%{confdir}/piwik_analytics.inc.php
+pushd %{buildroot}%{plugindir}/piwik_analytics/
+ln -s ../../../../..%{confdir}/piwik_analytics.inc.php config.inc.php
 popd
 
 # Tasklist plugin
-mv %{buildroot}%{roundcube_plugins}/tasklist/config.inc.php.dist %{buildroot}%{roundcube_conf}/tasklist.inc.php
-pushd %{buildroot}%{roundcube_plugins}/tasklist/
-ln -s ../../../../..%{roundcube_conf}/tasklist.inc.php config.inc.php
+mv %{buildroot}%{plugindir}/tasklist/config.inc.php.dist %{buildroot}%{confdir}/tasklist.inc.php
+pushd %{buildroot}%{plugindir}/tasklist/
+ln -s ../../../../..%{confdir}/tasklist.inc.php config.inc.php
 popd
 
 asset_path="%{buildroot}%{roundcube}/public_html/assets"
 
 mkdir -p ${asset_path}
 
+mkdir -p $asset_path/skins/kolab/images
+install -pm 644 %{SOURCE1} $asset_path/skins/kolab/images/kolab_logo.png
+
+orig_dir="%{buildroot}%{roundcube}/plugins/"
+asset_dir="$asset_path/plugins/"
+
 # Compress the CSS
-for file in `find %{buildroot}/%{roundcube} -type f -name "*.css"`; do
-    asset_loc=$(dirname $(echo ${file} | sed -e "s|%{buildroot}/%{roundcube}|${asset_path}|g"))
-    mkdir -p ${asset_loc}
-    cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}).min && \
-        mv -vf ${asset_loc}/$(basename ${file}).min ${asset_loc}/$(basename ${file}) || \
-        cp -av ${file} ${asset_loc}/$(basename ${file})
+for file in `find $orig_dir -type f -name "*.css"`; do
+    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|$orig_dir|$asset_dir|g"))
+    %{__mkdir_p} ${asset_loc}
+    cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \
+        %{__rm} -rf ${file} || \
+        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
 done
 
-# Compress the JS
-for file in `find %{buildroot}/%{roundcube} -type f -name "*.js"`; do
-    asset_loc=$(dirname $(echo ${file} | sed -e "s|%{buildroot}/%{roundcube}|${asset_path}|g"))
-    mkdir -p ${asset_loc}
-    uglifyjs ${file} > ${asset_loc}/$(basename ${file}).min && \
-        mv -vf ${asset_loc}/$(basename ${file}).min ${asset_loc}/$(basename ${file}) || \
-        cp -av ${file} ${asset_loc}/$(basename ${file})
+# Compress the JS, but not the already minified
+for file in `find $orig_dir -type f -name "*.js" ! -name "*.min.js"`; do
+    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|$orig_dir|$asset_dir|g"))
+    %{__mkdir_p} ${asset_loc}
+    uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \
+        %{__rm} -rf ${file} || \
+        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
 done
 
-# Fix anything executable that does not have a shebang
-for file in `find %{buildroot}/%{roundcube} -type f -perm /a+x`; do
-    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
+# The already minified JS can just be copied over to the assets location
+for file in `find $orig_dir -type f -name "*.min.js"`; do