Kolab Groupware OBS

Changes of Revision 80

roundcubemail-plugins-kolab.spec Changed

@@ -114,7 +114,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_auth-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_auth) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-kolab_auth
@@ -137,8 +136,8 @@
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_delegation-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-kolab_delegation-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-kolab_auth) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_delegation) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-kolab_delegation
@@ -210,7 +209,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-ldap_authentication-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-ldap_authentication-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-ldap_authentication) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-ldap_authentication
@@ -242,7 +240,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-logon_page-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-logon_page-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-logon_page) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-logon_page
@@ -284,7 +281,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-piwik_analytics-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-piwik_analytics-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-piwik_analytics) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-piwik_analytics
@@ -309,7 +305,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-tinymce_config-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-tinymce_config-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-tinymce_config) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-tinymce_config
@@ -917,11 +912,20 @@
         echo "%package -n roundcubemail-plugin-$(basename ${plugin})"
         echo "Summary:        Plugin $(basename ${plugin})"
         echo "Group:          Applications/Internet"
-        echo "Requires:       roundcubemail(core) >= %{roundcube_version}"
+        echo "Requires:       roundcubemail(core) >= %%{roundcube_version}"
         echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         if [ -d "$plugin/skins/" ]; then
             echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         fi
+
+        for rplugin in $(grep -rn "require_plugin" ${plugin}/ | cut -d"'" -f2 | sort); do
+            if [ -d "%{name}-%{version}/plugins/${rplugin}" ]; then
+                echo "Requires:       roundcubemail(plugin-${rplugin}) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            else
+                echo "Requires:       roundcubemail(plugin-${rplugin}) >= %%{roundcube_version}"
+            fi
+        done
+
         echo "Provides:       roundcubemail(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         echo ""
         echo "%description -n roundcubemail-plugin-$(basename ${plugin})"
@@ -997,7 +1001,7 @@
     ) >> plugins-assets.files
 
     for skin in larry classic; do
-        for dir in $(find ${target_dir} -type d -name "${skin}" | sort); do
+        for dir in $(find ${target_dir} -type d -name "${skin}" | grep -v "helpdocs" | 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})
             %{__mv} $dir ${starget_dir}
@@ -1007,7 +1011,7 @@
                 echo "Summary:        Plugin $(basename ${plugin}) / Skin ${skin}"
                 echo "Group:          Applications/Internet"
                 echo "Requires:       roundcubemail(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Requires:       roundcubemail(skin-${skin}) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+                echo "Requires:       roundcubemail(skin-${skin}) >= %%{roundcube_version}"
                 echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin-${skin}-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
                 echo "Provides:       roundcubemail(plugin-$(basename ${plugin})-skin) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
                 echo "Provides:       roundcubemail(plugin-$(basename ${plugin})-skin-${skin}) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
@@ -1028,7 +1032,7 @@
                 echo "Summary:        Plugin $(basename ${plugin}) / Skin ${skin} (Assets)"
                 echo "Group:          Applications/Internet"
                 echo "Requires:       roundcubemail(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Requires:       roundcubemail(skin-${skin}) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+                echo "Requires:       roundcubemail(skin-${skin}) >= %%{roundcube_version}"
                 echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin-${skin}) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
                 echo "Provides:       roundcubemail(plugin-$(basename ${plugin})-skin-${skin}-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
                 echo ""