Kolab Groupware OBS

Changes of Revision 51

roundcubemail-plugins-kolab.spec Changed

@@ -44,7 +44,8 @@
 Requires:       php-kolabformat >= 1.0
 Requires:       php-kolab >= 0.5
 Requires:       php-pear(HTTP_Request2)
-Requires:       roundcubemail >= 1.0
+Requires:       php-pear(Net_LDAP3)
+Requires:       roundcubemail >= 1.1
 Obsoletes:      roundcubemail-kolab < %{version}-%{release}
 Provides:       roundcubemail-kolab = %{version}-%{release}
 
@@ -64,6 +65,7 @@
 cp -a plugins/* %{buildroot}%{roundcube_plugins}
 
 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
@@ -148,14 +150,26 @@
 ln -s ../../../../..%{roundcube_conf}/tasklist.inc.php config.inc.php
 popd
 
+asset_path="%{buildroot}%{roundcube}/public_html/assets"
+
+mkdir -p ${asset_path}
+
 # Compress the CSS
 for file in `find %{buildroot}/%{roundcube} -type f -name "*.css"`; do
-    cat ${file} | python-cssmin > ${file}.min && mv -f ${file}.min ${file}
+    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})
 done
 
 # Compress the JS
 for file in `find %{buildroot}/%{roundcube} -type f -name "*.js"`; do
-    uglifyjs ${file} > ${file}.min && mv -f ${file}.min ${file}
+    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})
 done
 
 # Fix anything executable that does not have a shebang
@@ -243,6 +257,22 @@
 %{roundcube_plugins}/piwik_analytics
 %{roundcube_plugins}/tasklist
 %{roundcube_plugins}/tinymce_config
+%dir %{roundcube}/public_html/assets/
+%dir %{roundcube}/public_html/assets/plugins/
+%{roundcube}/public_html/assets/plugins/calendar/
+%{roundcube}/public_html/assets/plugins/kolab_activesync/
+%{roundcube}/public_html/assets/plugins/kolab_addressbook/
+%{roundcube}/public_html/assets/plugins/kolab_delegation/
+%{roundcube}/public_html/assets/plugins/kolab_files/
+%{roundcube}/public_html/assets/plugins/kolab_folders/
+%{roundcube}/public_html/assets/plugins/kolab_notes/
+%{roundcube}/public_html/assets/plugins/kolab_tags/
+%{roundcube}/public_html/assets/plugins/libcalendaring/
+%{roundcube}/public_html/assets/plugins/libkolab/
+%{roundcube}/public_html/assets/plugins/odfviewer/
+%{roundcube}/public_html/assets/plugins/owncloud/
+%{roundcube}/public_html/assets/plugins/pdfviewer/
+%{roundcube}/public_html/assets/plugins/tasklist/
 %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

debian.rules Changed

@@ -20,6 +20,21 @@
 		ln -s ../../../../../etc/roundcubemail/$$plugin.inc.php $(CURDIR)/debian/roundcubemail-plugins-kolab/usr/share/roundcubemail/plugins/$$plugin/config.inc.php; \
 	done
 
+	# Compress the CSS
+
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.css"`; do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/public_html/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		cp -av $$file $$asset_loc/$$(basename $$file) ; \
+	done
+
+	# Compress the JS
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.js"`; do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/public_html/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		cp -av $$file $$asset_loc/$$(basename $$file) ; \
+	done
+
 	# Remove the original temp location in order for us to be able to replace it with a symbolic link
 	rm -rf $(CURDIR)/debian/roundcubemail-plugins-kolab/usr/share/roundcubemail/plugins/odfviewer/files