Kolab Groupware OBS

roundcubemail-skin-now.spec Changed

@@ -1,190 +1,205 @@
 %if 0%{?opensuse_bs}
-#!BuildIgnore:  php-mysqlnd
-#!BuildIgnore:  roundcubemail-plugin-jqueryui-skin-classic
-#!BuildIgnore:  roundcubemail-skin-classic
-#!BuildIgnore:  roundcubemail-plugin-managesieve-skin-classic
-#!BuildIgnore:  roundcubemail-plugin-acl-skin-classic
-#!BuildIgnore:  roundcubemail-skin-classic
-#!BuildIgnore:  lighttpd
-#!BuildIgnore:  cherokee
-#!BuildIgnore:  nginx
-#!BuildIgnore:  httpd-itk
+#!BuildIgnore: lighttpd
+#!BuildIgnore: nginx
 %endif
 
-Name:           roundcubemail-skin-now
-Version:        0.3.6
-Release:	    1%{?dist}
-Summary:        Kolab Now skin for Roundcube
+%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
-Group:          Web/Applications
-License:        CC-BY-SA
-URL:            http://www.kolab.org
-Source0:        http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
-
-BuildArch:      noarch
-
-BuildRequires:  roundcubemail(skin-chameleon) >= 0.3.8
-BuildRequires:  roundcubemail(skin-chameleon-assets) >= 0.3.8
-
-%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le"
-BuildRequires:  nodejs-less
-%if 0%{?suse_version} < 1
-BuildRequires:  uglify-js
+%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
+%global with_systemd 0
+%else
+%global with_systemd 1
 %endif
+
+%if 0%{?suse_version}
+%global httpd_group www
+%global httpd_name apache2
+%global httpd_user wwwrun
 %else
-BuildRequires:  php-lessphp
+%if 0%{?plesk}
+%global httpd_group roundcube_sysgroup
+%global httpd_name httpd
+%global httpd_user roundcube_sysuser
+%else
+%global httpd_group apache
+%global httpd_name httpd
+%global httpd_user apache
+%endif
 %endif
 
-BuildRequires:  python
+%global datadir %{_datadir}/roundcubemail
+%global plugindir %{datadir}/plugins
+%global confdir %{_sysconfdir}/roundcubemail
+%global tmpdir %{_var}/lib/roundcubemail
 
-Requires:       roundcubemail(skin-now) = %{?epoch:%%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-now-assets) = %{?epoch:%%{epoch}:}%{version}-%{release}
+Name:               roundcubemail-skin-now
+Version:            0.4
+Release:            14.beta1%{?dist}
+Summary:            Kolab Now skin for Roundcube
 
-%description
-This package contains a Kolab Groupware skin for the Roundcube web mail
-interface.
+Group:              Web/Applications
+License:            CC-BY-SA
+URL:                https://kolabsystems.com
+Source0:            %{name}-%{version}-beta1.tar.gz
+Source1:            comm.py
 
-%package core
-Summary:        Now skin for Roundcube
-Group:          Applications/Internet
-Requires:       roundcubemail >= 1.1
-Requires:       roundcubemail(skin-larry) >= 1.1
-Provides:       roundcubemail(skin-now) = %{?epoch:%%{epoch}:}%{version}-%{release}
+BuildArch:          noarch
 
-%description core
-Kolab skin for Roundcube
+BuildRequires:      nodejs-less
+BuildRequires:      php-lessphp
+BuildRequires:      python
+BuildRequires:      roundcubemail(skin-kolab)
 
-%package assets
-Summary:        Assets for the Now skin
-Group:          Applications/Internet
-Requires:       roundcubemail(skin-larry-assets) >= 1.1
-Provides:       roundcubemail(skin-now-assets) = %{?epoch:%%{epoch}:}%{version}-%{release}
+Requires:           roundcubemail-core
+Provides:           roundcubemail(skin-kolab) = %{version}-%{release}
 
-%description assets
-Assets for the Now skin
+%description
+This package contains the Kolab Now Groupware skin for Roundcube
 
 %prep
-%setup -q
-
-%build
+%setup -q -n %{name}-%{version}-beta1/
+
+rm -rvf kolab/
+rm -rvf plesk/
+
+find . | sort
+
+find \
+    %{datadir}/skins/kolab/ \
+    %{datadir}/public_html/assets/skins/kolab/ \
+    %{datadir}/plugins/libkolab/skins/kolab/ \
+    %{datadir}/public_html/assets/plugins/libkolab/skins/kolab/ \
+    -type f | sort | while read file; do
+    target_dir=$(dirname ${file} | sed -e 's|%{datadir}|.|g' -e 's|./public_html/assets/|./|g' -e 's|./public_html/assets/plugins/libkolab/|./|g' -e 's|/kolab|/now|g')
+    file_name=$(basename ${file})
+    if  ! -d ${target_dir} ; then
+        %{__mkdir_p} ${target_dir}
+    fi
+    cp -av ${file} ${target_dir}
+done
 
-%install
-mkdir -p \
-    %{buildroot}/%{_datadir}/roundcubemail/skins/now/ \
-    %{buildroot}/%{_datadir}/roundcubemail/public_html/assets/skins/now/
+find . | sort
 
-cp -av /usr/share/roundcubemail/skins/chameleon/* \
-    %{buildroot}/%{_datadir}/roundcubemail/skins/now/.
+sed -i -e 's/"kolab"/"now"/g' \
+    $(find skins/now/ plugins/libkolab/skins/now/ -type f)
 
-cp -av /usr/share/roundcubemail/public_html/assets/skins/chameleon/* \
-    %{buildroot}/%{_datadir}/roundcubemail/public_html/assets/skins/now/.
+find now/ -type f | sort | while read file; do
+    target_dir="./skins/$(dirname ${file})"
+    file_name=$(basename ${file})
+    if  ! -d ${target_dir} ; then
+        %{__mkdir_p} ${target_dir}
+    fi
+    cp -av ${file} ${target_dir}
+done
 
-rm -rf skins/now/colors.sh
+rm -rvf now/
 
-cp -av skins/now/* %{buildroot}/%{_datadir}/roundcubemail/skins/now/.
+sed -i -e 's/"kolab"/"now"/g' plugins/libkolab/skins/now/libkolab.less
 
-orig_dir=%{buildroot}/%{_datadir}/roundcubemail/skins/now/
-asset_dir=%{buildroot}/%{_datadir}/roundcubemail/public_html/assets/skins/now/
+find . | sort
 
-# Compress the CSS
-for file in `find ${orig_dir} -type f -name "*.less" ! -name "colors.less" | grep -vE "${orig_dir}/(plugins|skins)/"`; do
-    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|$asset_dir|g"))
-    %{__mkdir_p} ${asset_loc}
-    (
-        %{_bindir}/lessc -x ${file} > ${asset_loc}/$(basename ${file} .less).css || \
-            cat $(dirname ${file})/colors.less ${file} | %{_bindir}/plessc -r -f=compressed > ${asset_loc}/$(basename ${file} .less).css
-        ) && \
-        %{__rm} -rf ${file} || \
-        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
-done
+%build
 
-# Compress the JS, but not the already minified
-for file in `find ${orig_dir} -type f -name "*.js" ! -name "*.min.js" | grep -vE "${orig_dir}/(plugins|skins)/"`; 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
+# Compile and compress the CSS
+for file in `find . -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do
+    %{_bindir}/lessc --relative-urls ${file} > $(dirname ${file})/$(basename ${file} .less).css
 
-# The already minified JS can just be copied over to the assets location
-for file in `find ${orig_dir} -type f -name "*.min.js" | grep -vE "${orig_dir}/(plugins|skins)/"`; 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})
+    sed -i \
+        -e "s|../../../skins/now/images/contactpic.png|../../../../skins/now/images/contactpic.png|" \
+        -e "s|../../../skins/now/images/watermark.jpg|../../../../skins/now/images/watermark.jpg|" \
+        $(dirname ${file})/$(basename ${file} .less).css

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -6,13 +6,112 @@
 	dh $@
 
 override_dh_install:
-	mkdir -p $(CURDIR)/debian/roundcubemail-skin-now/usr/share/roundcubemail/skins/now/
-	cp -av /usr/share/roundcubemail/skins/chameleon/* \
-		$(CURDIR)/debian/roundcubemail-skin-now/usr/share/roundcubemail/skins/now/.
-	dh_install
-	mkdir -p $(CURDIR)/debian/roundcubemail-skin-now/usr/share/roundcubemail/assets/skins/
-	cp -a $(CURDIR)/debian/roundcubemail-skin-now/usr/share/roundcubemail/skins/now/ \
-		$(CURDIR)/debian/roundcubemail-skin-now/usr/share/roundcubemail/assets/skins/now/
-	for file in $$(find $(CURDIR)/debian/roundcubemail-skin-now/share/roundcubemail/skins/now -type f -name "*.less" ! -name "colors.less"); do \
-		lessc -x $${file} > $$(dirname $${file})/$$(basename $${file} .less).css ; \
+	rm -rvf kolab/
+	rm -rvf plesk/
+
+	find . | sort
+
+	find \
+		/usr/share/roundcubemail/skins/kolab/ \
+		/usr/share/roundcubemail/public_html/assets/skins/kolab/ \
+		/usr/share/roundcubemail/plugins/libkolab/skins/kolab/ \
+		/usr/share/roundcubemail/public_html/assets/plugins/libkolab/skins/kolab/ \
+		-type f | sort | while read file; do \
+			target_dir=$$(dirname $${file} | sed -e 's|/usr/share/roundcubemail|.|g' -e 's|/public_html/assets/|/|g' -e 's|/public_html/assets/plugins/libkolab/|/|g' -e 's|/kolab|/now|g') ; \
+			file_name=$$(basename $${file}) ; \
+			if  ! -d i$${target_dir} ; then \
+				mkdir -p $${target_dir} ; \
+			fi ; \
+			cp -av $${file} $${target_dir} ; \
+		done
+
+	find . | sort
+
+	sed -i -e 's/"kolab"/"now"/g' \
+		$$(find skins/now/ plugins/libkolab/skins/now/ -type f)
+
+	find kolab/ -type f | sort | while read file; do \
+		target_dir="./skins/$$(dirname $${file})" ; \
+		file_name=$$(basename $${file}) ; \
+		if  ! -d $${target_dir} ; then \
+			mkdir -p $${target_dir} ; \
+		fi ; \
+		cp -av $${file} $${target_dir} ; \
 	done
+
+	rm -rvf kolab/
+
+	find . | sort
+
+	sed -i -e 's/"kolab"/"now"/g' plugins/libkolab/skins/now/libkolab.less
+
+	for file in $$(find . -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"); do \
+		lessc --relative-urls $${file} > $$(dirname $${file})/$$(basename $${file} .less).css ; \
+		sed -i \
+			-e "s|../../../skins/now/images/contactpic.png|../../../../skins/now/images/contactpic.png|" \
+			-e "s|../../../skins/now/images/watermark.jpg|../../../../skins/now/images/watermark.jpg|" \
+			$$(dirname $${file})/$$(basename $${file} .less).css ; \
+	done
+
+	for orig_dir in "skins/now/" "plugins/libkolab/skins/now/"; do \
+		asset_dir="public_html/assets/$${orig_dir}" ; \
+		\
+		# 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")) ; \
+			mkdir -p $${asset_loc} ; \
+			cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) ; \
+		done || : \
+		\
+		# 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}) ; \
+		done || : \
+		\
+		# 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} ; \
+			cp -av $${file} $${asset_loc}/$$(basename $${file}) ; \
+		done || : \
+		\
+		# Other assets ; \
+		for file in $$(find $${orig_dir} -type f \
+			-name "*.eot" -o \
+			-name "*.gif" -o \
+			-name "*.ico" -o \
+			-name "*.jpg" -o \
+			-name "*.mp3" -o \
+			-name "*.png" -o \
+			-name "*.svg" -o \
+			-name "*.swf" -o \
+			-name "*.tif" -o \
+			-name "*.ttf" -o \
+			-name "*.woff" -o \
+			-name "*.woff2" \
+		); do \
+			asset_loc=$$(dirname $$(echo $${file} | sed -e "s|$${orig_dir}|$${asset_dir}|g")) ; \
+			mkdir -p $${asset_loc} ; \
+			cp -avf $${file} $${asset_loc}/$$(basename $${file}) ; \
+		done || : \
+		\
+		# Purge empty directories ; \
+		find $${orig_dir} -type d -empty -delete || : ; \
+	done
+
+	cp -av skins/now/watermark.html public_html/assets/skins/now/watermark.html
+
+	find . | sort
+
+	rm -rvf skins/kolab/
+	rm -rvf plugins/libkolab/skins/kolab/
+	rm -rvf public_html/assets/plugins/libkolab/skins/kolab/
+	rm -rvf public_html/assets/skins/kolab/
+
+	cp -av skins/now/ debian/roundcubemail-skin-now/usr/share/roundcubemail/skins/.
+	cp -av plugins/libkolab/skins/now/ debian/roundcubemail-skin-now/usr/share/roundcubemail/plugins/libkolab/skins/.
+	cp -av public_html/assets/plugins/libkolab/skins/now/ debian/roundcubemail-skin-now/usr/share/roundcubemail/public_html/assets/plugins/libkolab/skins/.
+	cp -av public_html/assets/skins/now/ debian/roundcubemail-skin-now/usr/share/roundcubemail/public_html/assets/skins/.
+

debian.tar.gz/dirs Changed

debian.tar.gz/install Changed

roundcubemail-skin-now.dsc Changed

Changes of Revision 6