Request 2312 (accepted)

Overview

Request 2312 (accepted)

Update roundcubemail-plugin-contextmenu

Created by vanmeeuwen over 5 years ago
In state accepted

Submit roundcubemail-plugin-contextmenu

Submit package Kolab:Winterfell / roundcubema...ontextmenu to package Kolab:16 / roundcubemail-plugin-contextmenu

roundcubemail-plugin-contextmenu.spec Changed

@@ -1,9 +1,20 @@
+%if 0%{?opensuse_bs}
+#!BuildIgnore:  caddy
+#!BuildIgnore:  lighttpd
+#!BuildIgnore:  nginx
+%endif
+
 %global datadir %{_datadir}/roundcubemail
 %global plugindir %{datadir}/plugins
 
+%global rc_version 3.0
+%global rc_rel_suffix alpha1
+%global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
+%global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
+
 Name:           roundcubemail-plugin-contextmenu
-Version:        2.3
-Release:        1%{?dist}
+Version:        %{rc_version}
+Release:        1%{?dot_rel_suffix}%{?dist}
 Summary:        Contextmenu plugin for Roundcube Webmail
 
 Group:          Applications/Internet
@@ -11,15 +22,20 @@
 URL:            http://www.kolab.org
 
 # From f3458e5a74372a64ad2387f90ceca33373e259ec
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}%{?dash_rel_suffix}.tar.gz
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
-%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
+%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le"
+BuildRequires:  nodejs-less
+%if 0%{?suse_version} < 1
 BuildRequires:  python-cssmin
 BuildRequires:  uglify-js
 %endif
+%endif
+
+BuildRequires:  roundcubemail(skin-elastic)
 
 Requires:       roundcubemail(core) >= 1.1
 
@@ -29,7 +45,11 @@
 reply and forward.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?dash_rel_suffix}
+
+find . -type f -name "*.less" | while read file; do
+    sed -i -e 's|../../../../skins/elastic/styles/|../../../../../../../../usr/share/roundcubemail/skins/elastic/styles/|g' ${file}
+done
 
 %build
 
@@ -46,6 +66,16 @@
 orig_dir="%{buildroot}%{datadir}/plugins/"
 asset_dir="$asset_path/plugins/"
 
+# Compile and compress the CSS
+for file in `find ${orig_dir} -type f -name "*.less" ! -name "colors.less"`; do
+    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
+    %{__mkdir_p} ${asset_loc}
+    %{_bindir}/lessc --relative-urls -x ${file} > ${asset_loc}/$(basename ${file} .less).css || \
+        cat ${file} | %{_bindir}/plessc -r -f=compressed > ${asset_loc}/$(basename ${file} .less).css || :
+done
+find ${asset_loc} -type f -name "*.css" -empty -delete
+find ${asset_loc} -type d -empty -delete
+
 # Compress the CSS
 for file in `find $orig_dir -type f -name "*.css"`; do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|$orig_dir|$asset_dir|g"))
@@ -114,6 +144,9 @@
 %{datadir}/public_html/assets/plugins/contextmenu/
 
 %changelog
+* Thu Apr 12 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.0-1.alpha0
+- Pre-release of version 3.0
+
 * Wed Aug  2 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.3-1
 - Release of version 2.3

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -6,8 +6,15 @@
 	dh $@
 
 override_dh_install:
-	mkdir -p $(CURDIR)/debian/roundcubemail-plugin-contextmenu/usr/share/roundcubemail/plugins/contextmenu/
-	cp -a \
+	mkdir -p \
+		$(CURDIR)/debian/roundcubemail-plugin-contextmenu/usr/share/roundcubemail/skins/ \
+		$(CURDIR)/debian/roundcubemail-plugin-contextmenu/usr/share/roundcubemail/plugins/contextmenu/
+
+	cp -av \
+		/usr/share/roundcubemail/skins/elastic/ \
+		$(CURDIR)/debian/roundcubemail-plugin-contextmenu/usr/share/roundcubemail/skins/
+
+	cp -av \
 		CHANGELOG \
 		README.md \
 		contextmenu.js \
@@ -16,18 +23,22 @@
 		skins \
 		$(CURDIR)/debian/roundcubemail-plugin-contextmenu/usr/share/roundcubemail/plugins/contextmenu/
 
+	lessc --relative-urls $(CURDIR)/debian/roundcubemail-plugin-contextmenu/usr/share/roundcubemail/plugins/contextmenu/skins/elastic/contextmenu.less
+
+	rm -rvf $(CURDIR)/debian/roundcubemail-plugin-contextmenu/usr/share/roundcubemail/skins/
+
 	# Compress the CSS
 	for file in `find $(CURDIR)/debian/roundcubemail-plugin-contextmenu/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 ; \
-		mv -f $$file $$asset_loc/$$(basename $$file) ; \
+		cp -av $$file $$asset_loc/$$(basename $$file) ; \
 	done
-	
+
 	# Compress the JS
 	for file in `find $(CURDIR)/debian/roundcubemail-plugin-contextmenu/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 ; \
-		mv -f $$file $$asset_loc/$$(basename $$file) ; \
+		cp -av $$file $$asset_loc/$$(basename $$file) ; \
 	done
 
 	# Other assets
@@ -45,6 +56,6 @@
 		); 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 ; \
-		mv -f $$file $$asset_loc/$$(basename $$file); \
+		cp -av $$file $$asset_loc/$$(basename $$file); \
 	done

roundcubemail-plugin-contextmenu-2.3.tar.gz Deleted

roundcubemail-plugin-contextmenu-3.0-alpha1.tar.gz Added

roundcubemail-plugin-contextmenu.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2312 0

Request History

vanmeeuwen created request over 5 years ago

Update roundcubemail-plugin-contextmenu

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago