Request 2364 (accepted)

Overview

Request 2364 (accepted)

Require skin-larry

Created by vanmeeuwen over 6 years ago
In state accepted

Submit roundcubemail-plugins-kolab

Submit package Kolab:Winterfell / roundcubema...gins-kolab to package Kolab:16 / roundcubemail-plugins-kolab

roundcubemail-plugins-kolab.spec Changed

@@ -43,7 +43,7 @@
 Name:           roundcubemail-plugins-kolab
 Version:        3.4
 
-Release:        39%{?dot_rel_suffix}%{?dist}
+Release:        46%{?dot_rel_suffix}%{?dist}
 
 Summary:        Kolab Groupware plugins for Roundcube Webmail
 
@@ -121,13 +121,12 @@
 Requires:       roundcubemail(plugin-calendar-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-calendar-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-calendar-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -166,13 +165,12 @@
 Requires:       roundcubemail(plugin-kolab_2fa-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-kolab_2fa-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-kolab_2fa-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -196,13 +194,12 @@
 Requires:       roundcubemail(plugin-kolab_activesync-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-kolab_activesync-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-kolab_activesync-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -225,13 +222,12 @@
 Requires:       roundcubemail(plugin-kolab_addressbook-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-kolab_addressbook-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-kolab_addressbook-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -267,13 +263,12 @@
 Requires:       roundcubemail(plugin-kolab_chat-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-kolab_chat-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-kolab_chat-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -309,13 +304,12 @@
 Requires:       roundcubemail(plugin-kolab_delegation-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-kolab_delegation-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-kolab_delegation-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -338,13 +332,12 @@
 Requires:       roundcubemail(plugin-kolab_files-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-kolab_files-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-kolab_files-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -382,13 +375,12 @@
 Requires:       roundcubemail(plugin-kolab_notes-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-kolab_notes-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-kolab_notes-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -424,13 +416,12 @@
 Requires:       roundcubemail(plugin-kolab_tags-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-kolab_tags-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-kolab_tags-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -465,23 +456,24 @@
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-libcalendaring-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
-%if 0%{?bootstrap} < 1
+Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-libcalendaring-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
+Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 %else
 Requires:       roundcubemail(skin-chameleon) >= 0.3.9
+Requires:       roundcubemail(plugin-libcalendaring-skin-elastic) >= 1.4
+Requires:       roundcubemail(plugin-libcalendaring-skin-larry) >= 1.4
 %endif
 %endif
-Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail-plugin-libcalendaring-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail-plugin-libcalendaring-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-libcalendaring
@@ -494,13 +486,12 @@
 Requires:       roundcubemail(plugin-libkolab-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-libkolab-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-libkolab-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -591,13 +582,12 @@
 Requires:       roundcubemail(plugin-tasklist-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 Requires:       roundcubemail(plugin-tasklist-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-plesk) >= 0.4
-%endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       roundcubemail(skin-enterprise) >= 0.3.7
+Requires:       roundcubemail(plugin-tasklist-skin-larry) >= %{roundcube_version}
 Requires:       roundcubemail(skin-kolab) >= 0.4
 %endif
 %else
@@ -1374,13 +1364,12 @@
                 echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
                 echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
             fi
-            echo "%%if 0%%{?bootstrap} < 1"
             echo "Requires:       roundcubemail(skin-plesk) >= 0.4"
-            echo "%%endif"
             echo "%%else"
             echo "%%if 0%%{?kolab_enterprise}"
             echo "%%if 0%%{?bootstrap} < 1"
             echo "Requires:       roundcubemail(skin-enterprise) >= 0.3.7"
+            echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin-larry) >= %%{roundcube_version}"
             echo "Requires:       roundcubemail(skin-kolab) >= 0.4"
             echo "%%endif"
             if [ ! -d "${target_dir}/skins/elastic/" ]; then
@@ -1765,7 +1754,7 @@
     for skin in elastic larry; do
         touch plugin-${plugin}-skin-${skin}.files
         touch plugin-${plugin}-skin-${skin}-assets.files
-        
+
         if [ ! -d "%{name}-plugin-${plugin}-skin-${skin}-%{version}%{?dash_rel_suffix}/plugins/${plugin}/skins" ]; then
             rm -vf plugin-${plugin}-skin-${skin}.files
             rm -vf plugin-${plugin}-skin-${skin}-assets.files

Build Results
RPM Lint

Refresh

Comments for request 2364 0

Request History

vanmeeuwen created request over 6 years ago

Require skin-larry

vanmeeuwen accepted review over 6 years ago

vanmeeuwen approved review over 6 years ago

vanmeeuwen accepted request over 6 years ago