Request 1942 (accepted)

This request supersedes: request 1941 (Show diff)

Overview

Request 1942 (accepted)

Enhance packaging to split plugins

Created by vanmeeuwen almost 8 years ago
In state accepted
Supersedes 1941
Open review for Admin
Open review for kolab-developers

Submit roundcubemail

Submit package home:vanmeeuwen:plesk-17 / roundcubemail to package Kolab:Winterfell / roundcubemail

roundcubemail.spec Changed

@@ -26,10 +26,16 @@
 %global httpd_name apache2
 %global httpd_user wwwrun
 %else
+%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
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
@@ -57,12 +63,17 @@
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
 
+Source100:      plesk.config.inc.php
+Source101:      plesk.password.inc.php
+
 Patch201:       default-configuration.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildRequires:  composer
+
+%if 0%{?plesk} < 1
 BuildRequires:  php-gd
 BuildRequires:  php-mbstring
 BuildRequires:  php-mcrypt
@@ -84,6 +95,7 @@
 BuildRequires:  php-pear(Net_Sieve)
 BuildRequires:  php-pear(Net_SMTP)
 BuildRequires:  php-pear(Net_Socket)
+%endif
 
 %if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
 BuildRequires:  python-cssmin
@@ -95,15 +107,19 @@
 #BuildRequires:  firefox
 BuildRequires:  python
 BuildRequires:  python-nose
-BuildRequires:  python-selenium
+#BuildRequires:  python-selenium
 
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 
+%if 0%{?plesk}
+Requires:       %{name}-skin-plesk
+%else
 %if 0%{?kolab_enterprise}
 Requires:       %{name}-skin-enterprise
 %else
 Requires:       %{name}-skin-chameleon
 %endif
+%endif
 
 # Archive and Zipdownload plugins required through
 # being listed in config.inc.php.sample.
@@ -145,12 +161,15 @@
 Requires:       php-pear(MDB2) >= 2.5.0
 Requires:       php-pear(MDB2_Driver_mysqli)
 Requires:       php-pear(Net_IDNA2)
-Requires:       php-pear(Net_LDAP2)
-Requires:       php-pear(Net_LDAP3)
 Requires:       php-pear(Net_Sieve)
 Requires:       php-pear(Net_SMTP)
 Requires:       php-pear(Net_Socket)
 
+%if 0%{?plesk} < 1
+Requires:       php-pear(Net_LDAP2)
+Requires:       php-pear(Net_LDAP3)
+%endif
+
 Requires:       %{name}(core-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -335,12 +354,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-jqueryui-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?fedora} >= 25
-# avoid that skin-classic is installed, which is not what we want. that would not look right
-Requires:       %{name}(plugin-jqueryui-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
 Requires:       %{name}(plugin-jqueryui-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
 Provides:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-jqueryui
@@ -797,18 +811,6 @@
 %description plugin-acl-skin-larry
 Plugin acl / Skin larry
 
-%package plugin-acl-skin-classic
-Summary:        Plugin acl / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-acl-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-acl-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-acl-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-acl-skin-classic
-Plugin acl / Skin classic
-
 %package plugin-archive-skin-larry
 Summary:        Plugin archive / Skin larry
 Group:          Applications/Internet
@@ -821,18 +823,6 @@
 %description plugin-archive-skin-larry
 Plugin archive / Skin larry
 
-%package plugin-archive-skin-classic
-Summary:        Plugin archive / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-archive) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-archive-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-archive-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-archive-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-archive-skin-classic
-Plugin archive / Skin classic
-
 %package plugin-enigma-skin-larry
 Summary:        Plugin enigma / Skin larry
 Group:          Applications/Internet
@@ -845,18 +835,6 @@
 %description plugin-enigma-skin-larry
 Plugin enigma / Skin larry
 
-%package plugin-enigma-skin-classic
-Summary:        Plugin enigma / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-enigma) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-enigma-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-enigma-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-enigma-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-enigma-skin-classic
-Plugin enigma / Skin classic
-
 %package plugin-help-skin-larry
 Summary:        Plugin help / Skin larry
 Group:          Applications/Internet
@@ -869,18 +847,6 @@
 %description plugin-help-skin-larry
 Plugin help / Skin larry
 
-%package plugin-help-skin-classic
-Summary:        Plugin help / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-help) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-help-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-help-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-help-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-help-skin-classic
-Plugin help / Skin classic
-
 %package plugin-hide_blockquote-skin-larry
 Summary:        Plugin hide_blockquote / Skin larry
 Group:          Applications/Internet
@@ -905,18 +871,6 @@
 %description plugin-jqueryui-skin-larry
 Plugin jqueryui / Skin larry
 
-%package plugin-jqueryui-skin-classic
-Summary:        Plugin jqueryui / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-jqueryui-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-jqueryui-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-jqueryui-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-jqueryui-skin-classic
-Plugin jqueryui / Skin classic
-
 %package plugin-legacy_browser-skin-larry
 Summary:        Plugin legacy_browser / Skin larry
 Group:          Applications/Internet
@@ -929,18 +883,6 @@
 %description plugin-legacy_browser-skin-larry
 Plugin legacy_browser / Skin larry
 
-%package plugin-legacy_browser-skin-classic
-Summary:        Plugin legacy_browser / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-legacy_browser) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-legacy_browser-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-legacy_browser-skin-classic
-Plugin legacy_browser / Skin classic
-
 %package plugin-managesieve-skin-larry
 Summary:        Plugin managesieve / Skin larry
 Group:          Applications/Internet
@@ -953,18 +895,6 @@
 %description plugin-managesieve-skin-larry
 Plugin managesieve / Skin larry
 
-%package plugin-managesieve-skin-classic
-Summary:        Plugin managesieve / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-managesieve) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-managesieve-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-managesieve-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-managesieve-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-managesieve-skin-classic
-Plugin managesieve / Skin classic
-
 %package plugin-markasjunk-skin-larry
 Summary:        Plugin markasjunk / Skin larry
 Group:          Applications/Internet
@@ -977,18 +907,6 @@
 %description plugin-markasjunk-skin-larry
 Plugin markasjunk / Skin larry
 
-%package plugin-markasjunk-skin-classic
-Summary:        Plugin markasjunk / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-markasjunk) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-markasjunk-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-markasjunk-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-markasjunk-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-markasjunk-skin-classic
-Plugin markasjunk / Skin classic
-
 %package plugin-vcard_attachments-skin-larry
 Summary:        Plugin vcard_attachments / Skin larry
 Group:          Applications/Internet
@@ -1001,18 +919,6 @@
 %description plugin-vcard_attachments-skin-larry
 Plugin vcard_attachments / Skin larry
 
-%package plugin-vcard_attachments-skin-classic
-Summary:        Plugin vcard_attachments / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-vcard_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-vcard_attachments-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-vcard_attachments-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-vcard_attachments-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-vcard_attachments-skin-classic
-Plugin vcard_attachments / Skin classic
-
 %package plugin-zipdownload-skin-larry
 Summary:        Plugin zipdownload / Skin larry
 Group:          Applications/Internet
@@ -1025,18 +931,6 @@
 %description plugin-zipdownload-skin-larry
 Plugin zipdownload / Skin larry
 
-%package plugin-zipdownload-skin-classic
-Summary:        Plugin zipdownload / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-zipdownload) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-zipdownload-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-zipdownload-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-zipdownload-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-zipdownload-skin-classic
-Plugin zipdownload / Skin classic
-
 %package plugin-acl-skin-larry-assets
 Summary:        Plugin acl / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1047,16 +941,6 @@
 %description plugin-acl-skin-larry-assets
 Plugin acl / Skin larry (Assets Package)
 
-%package plugin-acl-skin-classic-assets
-Summary:        Plugin acl / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-acl-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-acl-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-acl-skin-classic-assets
-Plugin acl / Skin classic (Assets Package)
-
 %package plugin-archive-skin-larry-assets
 Summary:        Plugin archive / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1067,16 +951,6 @@
 %description plugin-archive-skin-larry-assets
 Plugin archive / Skin larry (Assets Package)
 
-%package plugin-archive-skin-classic-assets
-Summary:        Plugin archive / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-archive-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-archive-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-archive-skin-classic-assets
-Plugin archive / Skin classic (Assets Package)
-
 %package plugin-enigma-skin-larry-assets
 Summary:        Plugin enigma / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1087,16 +961,6 @@
 %description plugin-enigma-skin-larry-assets
 Plugin enigma / Skin larry (Assets Package)
 
-%package plugin-enigma-skin-classic-assets
-Summary:        Plugin enigma / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-enigma-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-enigma-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-enigma-skin-classic-assets
-Plugin enigma / Skin classic (Assets Package)
-
 %package plugin-help-skin-larry-assets
 Summary:        Plugin help / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1107,16 +971,6 @@
 %description plugin-help-skin-larry-assets
 Plugin help / Skin larry (Assets Package)
 
-%package plugin-help-skin-classic-assets
-Summary:        Plugin help / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-help-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-help-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-help-skin-classic-assets
-Plugin help / Skin classic (Assets Package)
-
 %package plugin-hide_blockquote-skin-larry-assets
 Summary:        Plugin hide_blockquote / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1137,16 +991,6 @@
 %description plugin-jqueryui-skin-larry-assets
 Plugin jqueryui / Skin larry (Assets Package)
 
-%package plugin-jqueryui-skin-classic-assets
-Summary:        Plugin jqueryui / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-jqueryui-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-jqueryui-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-jqueryui-skin-classic-assets
-Plugin jqueryui / Skin classic (Assets Package)
-
 %package plugin-legacy_browser-skin-larry-assets
 Summary:        Plugin legacy_browser / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1157,16 +1001,6 @@
 %description plugin-legacy_browser-skin-larry-assets
 Plugin legacy_browser / Skin larry (Assets Package)
 
-%package plugin-legacy_browser-skin-classic-assets
-Summary:        Plugin legacy_browser / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-legacy_browser-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-legacy_browser-skin-classic-assets
-Plugin legacy_browser / Skin classic (Assets Package)
-
 %package plugin-managesieve-skin-larry-assets
 Summary:        Plugin managesieve / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1177,16 +1011,6 @@
 %description plugin-managesieve-skin-larry-assets
 Plugin managesieve / Skin larry (Assets Package)
 
-%package plugin-managesieve-skin-classic-assets
-Summary:        Plugin managesieve / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-managesieve-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-managesieve-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-managesieve-skin-classic-assets
-Plugin managesieve / Skin classic (Assets Package)
-
 %package plugin-markasjunk-skin-larry-assets
 Summary:        Plugin markasjunk / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1197,16 +1021,6 @@
 %description plugin-markasjunk-skin-larry-assets
 Plugin markasjunk / Skin larry (Assets Package)
 
-%package plugin-markasjunk-skin-classic-assets
-Summary:        Plugin markasjunk / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-markasjunk-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-markasjunk-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-markasjunk-skin-classic-assets
-Plugin markasjunk / Skin classic (Assets Package)
-
 %package plugin-vcard_attachments-skin-larry-assets
 Summary:        Plugin vcard_attachments / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1217,16 +1031,6 @@
 %description plugin-vcard_attachments-skin-larry-assets
 Plugin vcard_attachments / Skin larry (Assets Package)
 
-%package plugin-vcard_attachments-skin-classic-assets
-Summary:        Plugin vcard_attachments / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-vcard_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-vcard_attachments-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-vcard_attachments-skin-classic-assets
-Plugin vcard_attachments / Skin classic (Assets Package)
-
 %package plugin-zipdownload-skin-larry-assets
 Summary:        Plugin zipdownload / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1237,16 +1041,6 @@
 %description plugin-zipdownload-skin-larry-assets
 Plugin zipdownload / Skin larry (Assets Package)
 
-%package plugin-zipdownload-skin-classic-assets
-Summary:        Plugin zipdownload / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-zipdownload-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-zipdownload-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-zipdownload-skin-classic-assets
-Plugin zipdownload / Skin classic (Assets Package)
-
 %package skin-larry
 Summary:        Skin larry
 Group:          Applications/Internet
@@ -1258,17 +1052,6 @@
 %description skin-larry
 Skin larry
 
-%package skin-classic
-Summary:        Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description skin-classic
-Skin classic
-
 %package skin-larry-assets
 Summary:        Skin larry (Assets)
 Group:          Applications/Internet
@@ -1278,27 +1061,32 @@
 %description skin-larry-assets
 Skin larry (Assets Package)
 
-%package skin-classic-assets
-Summary:        Skin classic (Assets)
-Group:          Applications/Internet
-Provides:       %{name}(skin-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description skin-classic-assets
-Skin classic (Assets Package)
-
 %prep
 %setup -q -c "%{name}-%{version}"
 
 pushd %{name}-%{version}
 
+find . -type d -name "classic" | while read dir; do
+    rm -rvf ${dir}
+done
+
+%if 0%{?plesk}
+cp -vf %{SOURCE100} config/config.inc.php.sample
+cp -vf %{SOURCE101} plugins/password/config.inc.php.dist
+%endif
+
+cp -a program/resources/blank.tif program/resources/blank.tiff
+
 %patch201 -p1
 
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" -delete
 
-# Remove hidden files
+# Remove hidden files and directories
 find . -type f -name ".*" -delete
+find . -type d -name ".*" ! -name "." ! -name ".." | while read dir; do
+    rm -rvf ${dir}
+done
 
 # Remove file URI modifier
 sed -r -i -e 's/^(\s+)protected function file_mod(.*)$/\1protected function file_mod\2 { return $file; }\n\1protected function dummy\2/g' program/include/rcmail_output_html.php
@@ -1316,7 +1104,7 @@
 
 rm -rf %{name}-%{version}/plugins/jqueryui/themes/redmond
 
-for skin in larry classic; do
+for skin in larry; do
     # Template files and the like
     for sdir in $(find %{name}-%{version}/ -type d -name "${skin}" | sort); do
         target_dir=$(echo $sdir | %{__sed} -e "s|%{name}-%{version}|%{name}-skin-${skin}-%{version}|g")
@@ -1462,7 +1250,7 @@
         echo ""
     ) >> plugins-assets.files
 
-    for skin in larry classic; do
+    for skin in larry; do
         for dir in $(find $target_dir -type d -name "${skin}" | sort); do
             starget_dir=$(echo $dir | %{__sed} -e "s|%{name}-plugin-$(basename ${plugin})-%{version}|%{name}-plugin-$(basename ${plugin})-skin-${skin}-%{version}|g")
             %{__mkdir_p} $(dirname $starget_dir)
@@ -1570,7 +1358,9 @@
 %{__rm} -rf %{buildroot}
 
 %{__install} -d \
+%if 0%{?plesk} < 1
     %{buildroot}%{_ap_sysconfdir}/conf.d \
+%endif
     %{buildroot}%{_sysconfdir}/logrotate.d \
     %{buildroot}%{confdir} \
     %{buildroot}%{datadir}/public_html \
@@ -1581,7 +1371,9 @@
 # Move robots.txt to the correct place
 %{__install} -pm 644 robots.txt %{buildroot}%{datadir}/public_html/robots.txt
 
+%if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
+%endif
 
 %{__install} -pm 644 %SOURCE21 %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail
 
@@ -1709,6 +1501,7 @@
         -name "*.svg" -o \
         -name "*.swf" -o \
         -name "*.tif" -o \
+        -name "*.tiff" -o \
         -name "*.ttf" -o \
         -name "*.wav" -o \
         -name "*.woff" | \
@@ -1721,9 +1514,9 @@
 
 new_files > core.files
 
-echo "== Files for core: =="
-cat core.files
-echo "==========================="
+#echo "== Files for core: =="
+#cat core.files
+#echo "==========================="
 
 for file in `find %{name}-assets-%{version}/ -type f`; do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-assets-%{version}|%{buildroot}%{datadir}|g"))
@@ -1733,15 +1526,15 @@
 
 new_files > core-assets.files
 
-echo "== Files for core assets: =="
-cat core-assets.files
-echo "==========================="
+#echo "== Files for core assets: =="
+#cat core-assets.files
+#echo "==========================="
 
 echo "================================================================="
 echo "Dividing Skin Assets and Non-Assets"
 echo "================================================================="
 
-for skin in larry classic; do
+for skin in larry; do
     # Take the files from the original directory,
     # Find the ones that are assets,
     # Move those over to the assets-specific directory.
@@ -1789,6 +1582,7 @@
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
+            -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
             -name "*.woff"
@@ -1810,18 +1604,18 @@
 
     new_files > skin-${skin}.files
 
-    echo "== Files for skin ${skin}: =="
-    cat skin-${skin}.files
-    echo "==========================="
+    #echo "== Files for skin ${skin}: =="
+    #cat skin-${skin}.files
+    #echo "==========================="
 
     %{__mkdir_p} %{buildroot}%{datadir}/public_html/assets/skins/
     cp -a %{name}-skin-${skin}-assets-%{version}/public_html/assets/skins/* %{buildroot}%{datadir}/public_html/assets/skins/.
 
     new_files > skin-${skin}-assets.files
 
-    echo "== Files for skin assets ${skin}: =="
-    cat skin-${skin}-assets.files
-    echo "==========================="
+    #echo "== Files for skin assets ${skin}: =="
+    #cat skin-${skin}-assets.files
+    #echo "==========================="
 done
 
 echo "================================================================="
@@ -1829,7 +1623,7 @@
 echo "================================================================="
 
 for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
-    for skin in larry classic; do
+    for skin in larry; do
         orig_dir="%{name}-plugin-${plugin}-skin-${skin}-%{version}"
 
         # No skin, no assets
@@ -1876,6 +1670,7 @@
                 -name "*.svg" -o \
                 -name "*.swf" -o \
                 -name "*.tif" -o \
+                -name "*.tiff" -o \
                 -name "*.ttf" -o \
                 -name "*.wav" -o \
                 -name "*.woff"
@@ -1901,9 +1696,9 @@
 
     new_files > plugin-${plugin}.files
 
-    echo "== Files for plugin ${plugin}: =="
-    cat plugin-${plugin}.files
-    echo "==========================="
+    #echo "== Files for plugin ${plugin}: =="
+    #cat plugin-${plugin}.files
+    #echo "==========================="
 
     # Skin-independent assets
     orig_dir="%{name}-plugin-${plugin}-%{version}"
@@ -1946,6 +1741,7 @@
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
+            -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
             -name "*.woff"
@@ -1972,13 +1768,13 @@
 
     new_files > plugin-${plugin}-assets.files
 
-    echo "== Files for plugin ${plugin}: =="
-    cat plugin-${plugin}-assets.files
-    echo "==========================="
+    #echo "== Files for plugin ${plugin}: =="
+    #cat plugin-${plugin}-assets.files
+    #echo "==========================="
 done
 
 for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
-    for skin in larry classic; do
+    for skin in larry; do
         touch plugin-${plugin}-skin-${skin}.files
         touch plugin-${plugin}-skin-${skin}-assets.files
 
@@ -1996,9 +1792,9 @@
             echo "%doc README.md" > plugin-${plugin}-skin-${skin}.files
         fi
 
-        echo "== Files for skin ${plugin}-${skin}: =="
-        cat plugin-${plugin}-skin-${skin}.files
-        echo "==========================="
+        #echo "== Files for skin ${plugin}-${skin}: =="
+        #cat plugin-${plugin}-skin-${skin}.files
+        #echo "==========================="
 
         # Install the assets
         for file in `find %{name}-plugin-${plugin}-skin-${skin}-assets-%{version} -type f`; do
@@ -2012,9 +1808,9 @@
             echo "%doc README.md" > plugin-${plugin}-skin-${skin}-assets.files
         fi
 
-        echo "== Files for skin ${plugin}-${skin}: =="
-        cat plugin-${plugin}-skin-${skin}-assets.files
-        echo "==========================="
+        #echo "== Files for skin ${plugin}-${skin}: =="
+        #cat plugin-${plugin}-skin-${skin}-assets.files
+        #echo "==========================="
 
     done
 done
@@ -2247,7 +2043,7 @@
 fi
 
 /usr/share/roundcubemail/bin/updatedb.sh \
-    --dir /usr/share/doc/roundcubemail-%{version}/SQL/ \
+    --dir /usr/share/doc/roundcubemail-core-%{version}/SQL/ \
     --package roundcube || : \
     >/dev/null 2>&1
 
@@ -2756,13 +2552,16 @@
 
 %files core -f core.files
 %defattr(-,root,root,-)
+%doc %{name}-%{version}/SQL
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %if 0%{?suse_version}
 %dir %{_ap_sysconfdir}/
 %dir %{_ap_sysconfdir}/conf.d/
 %attr(0755,root,%{httpd_group}) %dir %{confdir}
 %endif
+%if 0%{?plesk} < 1
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
+%endif
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/config.inc.php
 %attr(0640,root,%{httpd_group}) %{confdir}/defaults.inc.php
 %attr(0640,root,%{httpd_group}) %{confdir}/mimetypes.php
@@ -2991,141 +2790,75 @@
 %files plugin-acl-skin-larry -f plugin-acl-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-acl-skin-classic -f plugin-acl-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-archive-skin-larry -f plugin-archive-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-archive-skin-classic -f plugin-archive-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-enigma-skin-larry -f plugin-enigma-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-enigma-skin-classic -f plugin-enigma-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-help-skin-larry -f plugin-help-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-help-skin-classic -f plugin-help-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-hide_blockquote-skin-larry -f plugin-hide_blockquote-skin-larry.files
 %defattr(-,root,root,-)
 
 %files plugin-jqueryui-skin-larry -f plugin-jqueryui-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-jqueryui-skin-classic -f plugin-jqueryui-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-legacy_browser-skin-larry -f plugin-legacy_browser-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-legacy_browser-skin-classic -f plugin-legacy_browser-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-managesieve-skin-larry -f plugin-managesieve-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-managesieve-skin-classic -f plugin-managesieve-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-markasjunk-skin-larry -f plugin-markasjunk-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-markasjunk-skin-classic -f plugin-markasjunk-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-vcard_attachments-skin-larry -f plugin-vcard_attachments-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-vcard_attachments-skin-classic -f plugin-vcard_attachments-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-zipdownload-skin-larry -f plugin-zipdownload-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-zipdownload-skin-classic -f plugin-zipdownload-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-acl-skin-larry-assets -f plugin-acl-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-acl-skin-classic-assets -f plugin-acl-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-archive-skin-larry-assets -f plugin-archive-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-archive-skin-classic-assets -f plugin-archive-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-enigma-skin-larry-assets -f plugin-enigma-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-enigma-skin-classic-assets -f plugin-enigma-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-help-skin-larry-assets -f plugin-help-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-help-skin-classic-assets -f plugin-help-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-hide_blockquote-skin-larry-assets -f plugin-hide_blockquote-skin-larry-assets.files
 %defattr(-,root,root,-)
 
 %files plugin-jqueryui-skin-larry-assets -f plugin-jqueryui-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-jqueryui-skin-classic-assets -f plugin-jqueryui-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-legacy_browser-skin-larry-assets -f plugin-legacy_browser-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-legacy_browser-skin-classic-assets -f plugin-legacy_browser-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-managesieve-skin-larry-assets -f plugin-managesieve-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-managesieve-skin-classic-assets -f plugin-managesieve-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-markasjunk-skin-larry-assets -f plugin-markasjunk-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-markasjunk-skin-classic-assets -f plugin-markasjunk-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-vcard_attachments-skin-larry-assets -f plugin-vcard_attachments-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-vcard_attachments-skin-classic-assets -f plugin-vcard_attachments-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-zipdownload-skin-larry-assets -f plugin-zipdownload-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-zipdownload-skin-classic-assets -f plugin-zipdownload-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files skin-larry -f skin-larry.files
 %defattr(-,root,root,-)
 
-%files skin-classic -f skin-classic.files
-%defattr(-,root,root,-)
-
 %files skin-larry-assets -f skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files skin-classic-assets -f skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %changelog
 * Wed Nov 30 2016 Timotheus Pokorra <tp@tbits.net> - 1.2.3-1
 - Check in upstream 1.2.3 release

debian.changelog Changed

debian.control Changed

@@ -1,9 +1,9 @@
 Source: roundcubemail
 Section: web
 Priority: extra
-Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
-Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
-Build-Depends: composer, debhelper (>= 8)
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
+Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), psa | bash
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/
@@ -11,12 +11,27 @@
 
 Package: roundcubemail
 Architecture: all
+Depends:    php-net-ldap3,
+            roundcubemail-core,
+            ${misc:Depends}
+Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Description: skinnable AJAX based webmail solution for IMAP servers
+ RoundCube Webmail is a browser-based multilingual IMAP client with an
+ application-like user interface. It provides full functionality
+ expected from an e-mail client, including MIME support, address book,
+ folder manipulation and message filters.
+ .
+ The user interface is fully skinnable using XHTML and CSS 2.
+
+Package: roundcubemail-core
+Architecture: all
 Depends:    apache2 | httpd,
             libmagic1,
             php-auth-sasl,
             php-mail-mime (>= 1.8.0),
             php-mdb2 (>= 2.5.0),
-            php-net-ldap3,
             php-net-smtp,
             php-net-socket,
             php-net-sieve,
@@ -28,12 +43,12 @@
             php5-ldap | php-ldap,
             php5-mcrypt | php-mcrypt,
             php5-pspell | php-pspell,
+            roundcubemail-plugin-filesystem-attachments,
+            roundcubemail-plugin-jqueryui,
+            roundcubemail-plugin-zipdownload,
             ucf,
             ${misc:Depends}
-Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Description: skinnable AJAX based webmail solution for IMAP servers
+Description: Core framework package for Roundcube
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
  expected from an e-mail client, including MIME support, address book,
@@ -43,3 +58,4 @@
  .
  This package provides the core code for roundcube. You should install
  it along with one of the roundcube database metapackages.
+

debian.rules Changed

@@ -6,56 +6,55 @@
 override_dh_auto_build:
 	mkdir -p $HOME/.composer
 	echo '{}' > $HOME/.composer/composer.json
-	patch -p1 < debian/patches/add-composer-autoloader.diff
+	patch -p1 < debian/patches/add-composer-autoloader.diff || :
 	composer.sh -vvv dumpautoload --optimize
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_psr4.php
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_namespaces.php
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_classmap.php
-	dh_auto_build
-
-override_dh_install:
-	mkdir -p $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
-	cp -a \
-		bin \
-		composer.json-dist \
-		plugins \
-		program \
-		public_html \
-		skins \
-		vendor \
-		$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
 
-	rm -rf $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/.htaccess
+	rm -rvf tests/
 
-	install -pm 644 index.php $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
-	install -pm 644 README.md $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
-	install -pm 644 robots.txt $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
+	cp -av program/resources/blank.tif program/resources/blank.tiff
 
 	# 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/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		cat $$file > $$asset_loc/$$(basename $$file) && rm -rf $$file || \
-		mv -v $$file $$asset_loc/$$(basename $$file); \
+	for file in `find $(CURDIR) -type f -name "*.css"`; do \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
+				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
+		cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) || \
+			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# Compress the JS, but not the already minified
-	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.js" ! -name "*.min.js"`; do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		cat $$file > $$asset_loc/$$(basename $$file) && rm -rf $$file || \
-		mv -v $$file $$asset_loc/$$(basename $$file); \
+	for file in `find $(CURDIR)/ -type f -name "*.js" ! -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
+				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
+		uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) || \
+			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
-	# The already minified JS can just be copied over to the assets location
-	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.min.js"`; do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		mv -v $$file $$asset_loc/$$(basename $$file); \
+	# The already minied JS can just be copied over to the assets location
+	for file in `find $(CURDIR)/ -type f -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
+				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# Other assets
-	for file in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f \
+	for file in $$(find $(CURDIR)/plugins/ $(CURDIR)/program/ $(CURDIR)/skins/ -type f \
 			-name "*.eot" -o \
 			-name "*.gif" -o \
 			-name "*.ico" -o \
@@ -66,50 +65,50 @@
 			-name "*.svg" -o \
 			-name "*.swf" -o \
 			-name "*.tif" -o \
+			-name "*.tiff" -o \
 			-name "*.ttf" -o \
 			-name "*.wav" -o \
 			-name "*.woff" \
 		); do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		mv -f $$file $$asset_loc/$$(basename $$file); \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
+				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		mv -vf $${file} $${asset_loc}/$$(basename $${file}); \
 	done
 
-	# The watermark.html is an asset, too
-	for file in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "watermark.html" ); do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		mv -f $$file $$asset_loc/$$(basename $$file); \
+	for plugin in `find $(CURDIR)/plugins/ -type d -mindepth 1 -maxdepth 1 -exec basename {} \;)`; do \
+		pkgname=$$(echo $${plugin} | sed -e 's/_/-/g') ; \
+		if [ -f "$(CURDIR)/plugins/$${plugin}/config.inc.php.dist" ]; then \
+			mv $(CURDIR)/plugins/$${plugin}/config.inc.php.dist $(CURDIR)/config/$${plugin}.inc.php ; \
+			echo "etc/roundcubemail/$${plugin}.inc.php usr/share/roundcubemail/plugins/$${plugin}/config.inc.php" >> debian/roundcubemail-plugin-$${pkgname}.links ; \
+			echo "config/$${plugin}.inc.php etc/roundcubemail/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		fi ; \
+		if [ -d "$(CURDIR)/public_html/assets/plugins/$${plugin}" ]; then \
+			echo "public_html/assets/plugins/$${plugin} usr/share/roundcubemail/public_html/assets/plugins" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		fi ; \
+		echo "usr/share/roundcubemail/plugins/$${plugin}" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
+		echo "plugins/$${plugin} usr/share/roundcubemail/plugins/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		echo "" >> debian/control ; \
+		echo "Package: roundcubemail-plugin-$${pkgname}" >> debian/control ; \
+		echo "Architecture: all" >> debian/control ; \
+		echo "Depends: roundcubemail-core" >> debian/control ; \
+		echo "Description: $${plugin}} plugin for Roundcube" >> debian/control ; \
+		echo "" >> debian/control ; \
+		sed -i -e "/Files:/ i\
+ roundcubemail-plugin-$${plugin} deb web extra" debian/control ; \
 	done
 
-	mv $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/assets/ \
-		$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/assets/ 
-
-	mkdir -p $(CURDIR)/debian/roundcubemail/etc/roundcubemail/
-	cp -a config/config.inc.php.sample $(CURDIR)/debian/roundcubemail/etc/roundcubemail/config.inc.php
-	cp -a config/defaults.inc.php $(CURDIR)/debian/roundcubemail/etc/roundcubemail/defaults.inc.php
-	cp -a config/mimetypes.php $(CURDIR)/debian/roundcubemail/etc/roundcubemail/mimetypes.php
-
-	ln -s ../../../etc/roundcubemail $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/config
-
-	# Fix file permission
-	find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -exec chmod ugo-x {} \;
-	find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/bin/ -type f -exec chmod ugo+x {} \;
+	if [ -f "/etc/plesk-release" ]; then \
+		cp -v ../SOURCES/plesk.config.inc.php config/config.inc.php ; \
+		cp -v ../SOURCES/plesk.password.inc.php config/password.inc.php ; \
+	else \
+		mv config/config.inc.php.sample config/config.inc.php ; \
+	fi
 
-	# Copy plugin configuration files to the correct location
-	for conffile in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/plugins -type f -name "config.inc.php.dist"); do \
-		plugin=$$(basename $$(dirname $$conffile)); \
-		mv $$conffile $(CURDIR)/debian/roundcubemail/etc/roundcubemail/$$plugin.inc.php; \
-		ln -s ../../../../../etc/roundcubemail/$$plugin.inc.php $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/plugins/$$plugin/config.inc.php; \
-	done
-
-	# Create the symbolic links for logs/ and temp/
-	ln -s ../../../var/lib/roundcubemail/ $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/temp
-	ln -s ../../../var/log/roundcubemail/ $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/logs
-
-	# Install apache2 configuration
-	mkdir -p $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available
-	install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available/roundcubemail.conf
+	dh_auto_build
 
 override_dh_compress:
-	dh_compress -Xsql   
+	dh_compress -Xsql

debian.tar.gz/dirs Deleted

debian.tar.gz/docs Deleted

debian.tar.gz/install Deleted

debian.tar.gz/postinst Deleted

@@ -1,51 +0,0 @@
-#!/bin/sh
-
-#EXTRA#
-#DEBHELPER#
-
-set -e
-
-fixperms() {
-    chown -R www-data:adm \
-        /var/lib/roundcubemail \
-        /var/log/roundcubemail
-    chmod 750 \
-        /var/lib/roundcubemail \
-        /var/log/roundcubemail
-	chown -R root:www-data /etc/roundcubemail
-	find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;
-	find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;
-}
-
-reload_apache()
-{
-    if apache2ctl configtest 2>/dev/null; then
-        invoke-rc.d apache2 $1 || true
-    else
-        echo "Your apache2 configuration is broken, so we're not restarting it for you."
-    fi
-}
-
-update_database() {
-    /usr/share/roundcubemail/bin/updatedb.sh \
-        --dir /usr/share/doc/roundcubemail/SQL/ \
-        --package roundcube \
-        >/dev/null 2>&1 || :
-}
-
-
-
-case "$1" in
-    configure)
-        fixperms
-        update_database
-        a2enmod rewrite
-        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then
-            a2ensite roundcubemail.conf
-            reload_apache reload
-        fi
-    ;;
-esac
-
-exit 0
-

debian.tar.gz/prerm Deleted

debian.tar.gz/roundcubemail-core.dirs Added

debian.tar.gz/roundcubemail-core.docs Added

debian.tar.gz/roundcubemail-core.install Added

debian.tar.gz/roundcubemail-core.links Added

debian.tar.gz/roundcubemail-core.postinst Added

@@ -0,0 +1,62 @@
+#!/bin/sh
+
+#EXTRA#
+#DEBHELPER#
+
+set -e
+
+fixperms() {
+    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "adm")
+    user=$(getent passwd roundcube_sysuser >/dev/null 2>&1 && echo "roundcube_sysuser" || echo "www-data")
+    chown -R ${user}:${group} \
+        /var/lib/roundcubemail \
+        /var/log/roundcubemail
+
+    chmod 750 \
+        /var/lib/roundcubemail \
+        /var/log/roundcubemail
+
+	chown -R root:${group} /etc/roundcubemail
+
+	find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;
+	find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;
+}
+
+reload_apache()
+{
+    if apache2ctl configtest 2>/dev/null; then
+        invoke-rc.d apache2 $1 || true
+    else
+        echo "Your apache2 configuration is broken, so we're not restarting it for you."
+    fi
+}
+
+update_database() {
+    /usr/share/roundcubemail/bin/updatedb.sh \
+        --dir /usr/share/doc/roundcubemail/SQL/ \
+        --package roundcube \
+        >/dev/null 2>&1 || :
+}
+
+case "$1" in
+    configure)
+        fixperms
+        update_database
+        a2enmod rewrite
+
+        sed -i "s/rcmail-\!24ByteDESkey\*Str/`head -c 200 /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c24`/" \
+            /etc/roundcubemail/defaults.inc.php || : &> /dev/null
+
+        if [ -f "/etc/plesk-release" ]; then
+            exit 0
+        fi
+
+        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then
+            a2ensite roundcubemail.conf
+        fi
+        reload_apache reload
+    ;;
+esac
+
+exit 0
+

debian.tar.gz/roundcubemail-core.postrm Changed

debian.tar.gz/roundcubemail-core.preinst Changed

debian.tar.gz/roundcubemail-core.prerm Added

debian.tar.gz/roundcubemail.dirs Added

debian.tar.gz/roundcubemail.docs Added

debian.tar.gz/roundcubemail.install Added

plesk.config.inc.php Added

@@ -0,0 +1,168 @@
+<?php
+    include_once("/usr/share/psa-roundcube/config/config.inc.php");
+
+/*  Incompatible with the stock installation
+
+    $components = explode('.', $_SERVER["HTTP_HOST"]);
+
+    if (count($components) > 2) {
+        array_shift($components);
+    }
+
+    $domain = implode('.', $components);
+    $config['session_domain'] = $domain;
+*/
+    $config['support_url'] = "https://kolabenterprise.com/support";
+
+    $config['product_name'] = "Kolab 16";
+
+    $config['use_secure_urls'] = true;
+
+    $config['assets_path'] = "/assets/";
+
+    $config['assets_dir'] = "/usr/share/roundcubemail/public_html/assets/";
+
+    $config['imap_cache'] = "db";
+    $config['imap_cache_ttl'] = "10d";
+
+    $config['message_cache'] = null;
+
+    $config['session_storage'] = "db";
+
+    $config['skin'] = "plesk";
+
+    $config['auto_create_user'] = true;
+
+    $config['enable_installer'] = false;
+
+    $config['plugins'] = Array(
+            'acl',
+            'archive',
+            'calendar',
+            'jqueryui',
+            'kolab_activesync',
+            'kolab_addressbook',
+            'kolab_config',
+            //'kolab_delegation',
+            'kolab_files',
+            'kolab_folders',
+            'kolab_notes',
+            'kolab_tags',
+            'libkolab',
+            'libcalendaring',
+            'managesieve',
+            'markasjunk',
+            'newmail_notifier',
+            'odfviewer',
+            'password',
+            'pdfviewer',
+            'tasklist',
+            'contextmenu',
+        );
+
+    $config['activesync_plugins'] = Array(
+            'libcalendaring',
+            'libkolab'
+        );
+
+    $config['kolabdav_plugins'] = Array(
+            'libcalendaring',
+            'libkolab'
+        );
+
+    $config['skip_deleted'] = true;
+
+    $config['read_when_deleted'] = true;
+    $config['flag_for_deletion'] = true;
+    $config['delete_always'] = true;
+
+    $config['session_lifetime'] = 180;
+    $config['password_charset'] = 'UTF-8';
+    $config['useragent'] = 'Kolab 16/Roundcube ' . RCUBE_VERSION;
+    $config['refresh_interval'] = 300;
+    $config['check_all_folders'] = false;
+    $config['dont_override'] = Array(
+            'check_all_folders',
+            'refresh_interval',
+            'skin'
+        );
+
+    $config['message_sort_col'] = 'date';
+    $config['default_list_mode'] = 'threads';
+    $config['autoexpand_threads'] = 2;
+
+    $config['message_sort_col'] = 'date';
+    $config['default_list_mode'] = 'threads';
+    $config['autoexpand_threads'] = 2;
+
+    $config['spellcheck_engine'] = 'pspell';
+    $config['spellcheck_dictionary'] = true;
+    $config['spellcheck_ignore_caps'] = true;
+    $config['spellcheck_ignore_nums'] = true;
+    $config['spellcheck_ignore_syms'] = true;
+    $config['spellcheck_languages'] = array(
+            'da' => 'Dansk',
+            'de' => 'Deutsch',
+            'en' => 'English',
+            'es' => 'Español',
+            'fr' => 'Français',
+            'it' => 'Italiano',
+            'nl' => 'Nederlands',
+            'pl' => 'Polski',
+            'pt' => 'Português',
+            'ru' => 'Русский',
+            'fi' => 'Suomi',
+            'sv' => 'Svenska'
+        );
+
+    $config['undo_timeout'] = 10;
+    $config['upload_progress'] = 2;
+    $config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';
+    $config['preview_pane'] = true;
+    $config['preview_pane_mark_read'] = 0;
+
+    // Bottom posting for reply mode
+    $config['reply_mode'] = 0;
+    $config['sig_above'] = false;
+    $config['mdn_requests'] = 0;
+    $config['mdn_default'] = false;
+    $config['dsn_default'] = false;
+    $config['reply_same_folder'] = false;
+
+    $config['performance_stats'] = true;
+
+    $config['drafts_mbox'] = 'Drafts';
+    $config['junk_mbox'] = 'Spam';
+    $config['sent_mbox'] = 'Sent';
+    $config['trash_mbox'] = 'Trash';
+
+    $config['skin_include_php'] = false;
+    $config['mime_magic'] = null;
+    $config['im_identify_path'] = '/usr/bin/identify';
+    $config['im_convert_path'] = '/usr/bin/convert';
+    $config['log_dir'] = 'logs/';
+    $config['temp_dir'] = '/var/lib/roundcubemail/';
+
+    $config['archive_mbox'] = 'Archive';
+    $config['junk_mbox'] = 'Spam';
+    $config['default_folders'] = array('INBOX', 'Archive', 'Drafts', 'Sent', 'Spam', 'Trash');
+
+    $config['log_driver'] = 'file';
+    $config['log_date_format'] = 'Y-M-d H:i:s O';
+    $config['syslog_id'] = 'roundcube';
+    $config['syslog_facility'] = LOG_USER;
+    $config['smtp_log'] = true;
+    $config['log_logins'] = true;
+    $config['log_session'] = true;
+    $config['debug_level'] = 1;
+    $config['devel_mode'] = false;
+    $config['sql_debug'] = false;
+    $config['memcache_debug'] = false;
+    $config['imap_debug'] = false;
+    $config['ldap_debug'] = false;
+    $config['smtp_debug'] = false;
+
+    $config['fileapi_backend'] = "kolab";
+    $config['fileapi_plugins'] = Array('kolab_folders');
+    $config['fileapi_manticore'] = false;
+    $config['fileapi_wopi_office'] = false;

plesk.password.inc.php Added

roundcubemail.dsc Changed

@@ -2,16 +2,17 @@
 Source: roundcubemail
 Binary: roundcubemail
 Architecture: all
-Version: 1:1.2.3-0~kolab3
-Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
-Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Version: 1:1.2.3-0~kolab4.16
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3
 Vcs-Browser: http://git.kolabsys.com/apt/roundcubemail/
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/
-Build-Depends: composer, debhelper (>= 8)
-Package-List: 
+Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), psa | bash
+Package-List:
  roundcubemail deb web extra
-Files: 
+ roundcubemail-core deb web extra
+Files:
  00000000000000000000000000000000 0 roundcubemail-1.2.3.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 1942 0

Request History

vanmeeuwen created request almost 8 years ago

Enhance packaging to split plugins

timotheus accepted request almost 8 years ago

looks good