Request 600 (accepted)

Overview

Request 600 (accepted)

Lighten the number of plugins installed by default, and split up assets

Created by vanmeeuwen about 10 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit roundcubemail-plugins-kolab

Submit package home:vanm...elopment / roundcube...ns-kolab to package Kolab:Development / roundcubem...gins-kolab

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
+    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|$orig_dir|$asset_dir|g"))
+    %{__mkdir_p} ${asset_loc}
+    %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
 done
 
-# Find files with a shebang that do not have executable permissions
-for file in `find %{buildroot}/%{roundcube} -type f ! -perm /a+x`; do
-    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
+# Other assets
+for file in $(find $orig_dir -type f \
+        -name "*.eot" -o \
+        -name "*.gif" -o \
+        -name "*.ico" -o \
+        -name "*.jpg" -o \
+        -name "*.png" -o \
+        -name "*.svg" -o \
+        -name "*.swf" -o \
+        -name "*.tif" -o \
+        -name "*.ttf" -o \
+        -name "*.woff"
+    ); do
+    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|$orig_dir|$asset_dir|g"))
+    %{__mkdir_p} ${asset_loc}
+    %{__mv} -vf ${file} ${asset_loc}/$(basename $file)
 done
 
-# Find files that have non-standard-executable-perm
-find %{buildroot}/%{roundcube} -type f -perm /g+wx -exec chmod -v g-w {} \;
-
-# Find files that are not readable
-find %{buildroot}/%{roundcube} -type f ! -perm /go+r -exec chmod -v go+r {} \;
-
 %post
 if [ -f "%{php_inidir}/apc.ini" ]; then
     if [ ! -z "`grep apc.enabled=1 %{php_inidir}/apc.ini`" ]; then
@@ -237,41 +248,36 @@
 %files
 %defattr(-,root,root,-)
 %if 0%{?suse_version}
-%dir %{roundcube_conf}
+%dir %{confdir}
 %dir %{roundcube}
-%dir %{roundcube_plugins}
-%endif
-%attr(0640,root,%{httpd_group}) %config(noreplace) %{roundcube_conf}/*.php
-%attr(0640,root,%{httpd_group}) %config(noreplace) %{roundcube_conf}/logon_page.html
-%dir %{roundcube}/skins/
-%dir %{roundcube}/skins/kolab/
-%dir %{roundcube}/skins/kolab/images/
-%{roundcube}/skins/kolab/images/kolab_logo.png
-%{roundcube_plugins}/calendar
-%{roundcube_plugins}/kolab_activesync
-%{roundcube_plugins}/kolab_addressbook
-%{roundcube_plugins}/kolab_auth
-%{roundcube_plugins}/kolab_config
-%{roundcube_plugins}/kolab_delegation
-%{roundcube_plugins}/kolab_files
-%{roundcube_plugins}/kolab_folders
-%{roundcube_plugins}/kolab_notes
-%{roundcube_plugins}/kolab_tags
-%{roundcube_plugins}/ldap_authentication
-%{roundcube_plugins}/libkolab
-%{roundcube_plugins}/libcalendaring
-%{roundcube_plugins}/logon_page
-%{roundcube_plugins}/odfviewer
-%{roundcube_plugins}/owncloud
-%{roundcube_plugins}/pdfviewer
-%{roundcube_plugins}/piwik_analytics
-%{roundcube_plugins}/tasklist
-%{roundcube_plugins}/tinymce_config
-%if 0%{?suse_version}
-%dir %{roundcube}/public_html/
+%dir %{plugindir}
 %endif
-%dir %{roundcube}/public_html/assets/
-%dir %{roundcube}/public_html/assets/plugins/
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/*.php
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/logon_page.html
+%dir %{roundcube}/public_html/assets/skins/
+%dir %{roundcube}/public_html/assets/skins/kolab/
+%dir %{roundcube}/public_html/assets/skins/kolab/images/
+%{roundcube}/public_html/assets/skins/kolab/images/kolab_logo.png
+%{plugindir}/calendar
+%{plugindir}/kolab_activesync
+%{plugindir}/kolab_addressbook
+%{plugindir}/kolab_auth
+%{plugindir}/kolab_config
+%{plugindir}/kolab_delegation
+%{plugindir}/kolab_files
+%{plugindir}/kolab_folders
+%{plugindir}/kolab_notes
+%{plugindir}/kolab_tags
+%{plugindir}/ldap_authentication
+%{plugindir}/libkolab
+%{plugindir}/libcalendaring
+%{plugindir}/logon_page
+%{plugindir}/odfviewer
+%{plugindir}/owncloud
+%{plugindir}/pdfviewer
+%{plugindir}/piwik_analytics
+%{plugindir}/tasklist
+%{plugindir}/tinymce_config
 %{roundcube}/public_html/assets/plugins/calendar/
 %{roundcube}/public_html/assets/plugins/kolab_activesync/
 %{roundcube}/public_html/assets/plugins/kolab_addressbook/
@@ -286,9 +292,14 @@
 %{roundcube}/public_html/assets/plugins/owncloud/
 %{roundcube}/public_html/assets/plugins/pdfviewer/
 %{roundcube}/public_html/assets/plugins/tasklist/
+%if 0%{?suse_version}
+%dir %{roundcube}/public_html/
+%dir %{roundcube}/public_html/assets/
+%dir %{roundcube}/public_html/assets/plugins/
 %attr(0770,root,%{httpd_group}) %dir /var/lib/roundcubemail
 %attr(0770,root,%{httpd_group}) %dir /var/lib/roundcubemail/plugins
-%attr(0770,root,%{httpd_group}) %{roundcube_lib}/plugins/odfviewer
+%endif
+%attr(0770,root,%{httpd_group}) %{tmpdir}/plugins/odfviewer
 
 %changelog
 * Thu Aug 29 2014 Daniel Hoffend <dh@dotlan.net> - 3.2-0.8.git

Build Results
RPM Lint

Refresh

Comments for request 600 0

Request History

vanmeeuwen created request about 10 years ago

Lighten the number of plugins installed by default, and split up assets

vanmeeuwen accepted request about 10 years ago

Please add a comment