Request 2363 (accepted)

Overview

Request 2363 (accepted)

Require skin-larry

Created by vanmeeuwen over 5 years ago
In state accepted

Submit roundcubemail

Submit package Kolab:Winterfell / roundcubemail to package Kolab:16 / roundcubemail

roundcubemail.spec Changed

@@ -12,8 +12,6 @@
 #!BuildIgnore:  php-mysql
 %endif
 
-## change for release bump
-
 %global bootstrap 0
 
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
@@ -58,7 +56,7 @@
 Name:           roundcubemail
 Version:        1.4
 
-Release:        49%{?dot_rel_suffix}%{?dist}
+Release:        65%{?dot_rel_suffix}%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -138,19 +136,15 @@
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?plesk}
-%if 0%{?bootstrap} < 1
 Requires:       %{name}-skin-plesk
 Requires:       %{name}-skin-plesk-larry
-%endif
 %else
 %if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
 Requires:       %{name}-skin-enterprise
 %else
 Requires:       %{name}-skin-chameleon
 %endif
 %endif
-%endif
 
 # Archive and Zipdownload plugins required through
 # being listed in config.inc.php.sample.
@@ -263,11 +257,13 @@
 Requires:       %{name}(plugin-acl-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-plesk) >= 0.4
 Requires:       %{name}(skin-plesk-larry) >= 0.3
+Requires:       %{name}(plugin-acl-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(plugin-acl-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-kolab) >= 0.4
 %endif
 %else
@@ -389,11 +385,13 @@
 Requires:       %{name}(plugin-enigma-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-plesk) >= 0.4
 Requires:       %{name}(skin-plesk-larry) >= 0.3
+Requires:       %{name}(plugin-enigma-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(plugin-enigma-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-kolab) >= 0.4
 %endif
 %else
@@ -445,11 +443,13 @@
 Requires:       %{name}(plugin-help-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-plesk) >= 0.4
 Requires:       %{name}(skin-plesk-larry) >= 0.3
+Requires:       %{name}(plugin-help-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(plugin-help-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-kolab) >= 0.4
 %endif
 %else
@@ -474,11 +474,13 @@
 Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-plesk) >= 0.4
 Requires:       %{name}(skin-plesk-larry) >= 0.3
+Requires:       %{name}(plugin-hide_blockquote-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(plugin-hide_blockquote-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-kolab) >= 0.4
 %endif
 Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -546,11 +548,13 @@
 Requires:       %{name}(plugin-jqueryui-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-plesk) >= 0.4
 Requires:       %{name}(skin-plesk-larry) >= 0.3
+Requires:       %{name}(plugin-jqueryui-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(plugin-jqueryui-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-kolab) >= 0.4
 %endif
 %else
@@ -588,11 +592,13 @@
 Requires:       %{name}(plugin-managesieve-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-plesk) >= 0.4
 Requires:       %{name}(skin-plesk-larry) >= 0.3
+Requires:       %{name}(plugin-managesieve-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(plugin-managesieve-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-kolab) >= 0.4
 %endif
 %else
@@ -757,11 +763,13 @@
 Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-plesk) >= 0.4
 Requires:       %{name}(skin-plesk-larry) >= 0.3
+Requires:       %{name}(plugin-vcard_attachments-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(plugin-vcard_attachments-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-kolab) >= 0.4
 %endif
 Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -812,23 +820,27 @@
 Requires:       %{name}(plugin-zipdownload-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?plesk}
 %if 0%{?bootstrap} < 1
+Obsoletes:      %{name}-plugin-zipdownload-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-zipdownload-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-plesk) >= 0.4
 Requires:       %{name}(skin-plesk-larry) >= 0.3
+Requires:       %{name}(plugin-zipdownload-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %else
 %if 0%{?kolab_enterprise}
 %if 0%{?bootstrap} < 1
 Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(plugin-zipdownload-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin-kolab) >= 0.4
 %endif
+Obsoletes:      %{name}-plugin-zipdownload-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-zipdownload-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 %else
 Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-zipdownload-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-zipdownload-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %endif
-Obsoletes:      %{name}-plugin-zipdownload-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-zipdownload-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}-plugin-zipdownload-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}-plugin-zipdownload-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-zipdownload) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-zipdownload
@@ -1557,11 +1569,13 @@
             fi
             echo "Requires:       %%{name}(skin-plesk) >= 0.4"
             echo "Requires:       %%{name}(skin-plesk-larry) >= 0.3"
+            echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin-larry) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
             echo "%%endif"
             echo "%%else"
             echo "%%if 0%%{?kolab_enterprise}"
             echo "%%if 0%%{?bootstrap} < 1"
             echo "Requires:       %%{name}(skin-enterprise) >= 0.3.7"
+            echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin-larry) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
             echo "Requires:       %%{name}(skin-kolab) >= 0.4"
             echo "%%endif"
             if [ ! -d "${target_dir}/skins/elastic/" ]; then

Build Results
RPM Lint

Refresh

Comments for request 2363 0

Request History

vanmeeuwen created request over 5 years ago

Require skin-larry

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago