Kolab Groupware OBS

Changes of Revision 72

roundcubemail-plugins-kolab.spec Changed

@@ -1125,12 +1125,6 @@
 for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
     for skin in larry classic; do
         orig_dir="%{name}-plugin-$plugin-skin-$skin-%{version}"
-
-        # No skin, no assets
-        if [ ! -d "$orig_dir" ]; then
-            continue
-        fi
-
         asset_dir="%{name}-plugin-$plugin-skin-$skin-assets-%{version}"
 
         # Compress the CSS
@@ -1140,7 +1134,7 @@
             cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \
                 %{__rm} -rf ${file} || \
                 %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
-        done
+        done || :
 
         # Compress the JS, but not the already minified
         for file in `find $orig_dir -type f -name "*.js" ! -name "*.min.js"`; do
@@ -1149,14 +1143,14 @@
             uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \
                 %{__rm} -rf ${file} || \
                 %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
-        done
+        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}
             %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
-        done
+        done || :
 
         # Other assets
         for file in $(find $orig_dir -type f \
@@ -1174,10 +1168,10 @@
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|$orig_dir|$asset_dir|g"))
             %{__mkdir_p} ${asset_loc}
             %{__mv} -vf ${file} ${asset_loc}/$(basename $file)
-        done
+        done || :
 
         # Purge empty directories
-        find $orig_dir -type d -empty -delete
+        find $orig_dir -type d -empty -delete || :
     done
 
     %{__mkdir_p} %{buildroot}%{plugindir}
@@ -1244,19 +1238,14 @@
     done
 
     # Purge empty directories
-    find $orig_dir -type d -empty -delete
-
-    if [ ! -d $asset_dir ]; then
-        touch plugin-$plugin-assets.files
-        continue
-    fi
+    find $orig_dir -type d -empty -delete || :
 
     # Install the assets
     for file in `find %{name}-plugin-$plugin-assets-%{version} -type f`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-$plugin-assets-%{version}|$asset_path|g"))
         %{__mkdir_p} ${asset_loc}
         %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
-    done
+    done || :
 
     new_files > plugin-$plugin-assets.files
 
@@ -1270,25 +1259,23 @@
         touch plugin-$plugin-skin-$skin.files
         touch plugin-$plugin-skin-$skin-assets.files
 
-        if [ ! -d "%{name}-plugin-${plugin}-skin-$skin-%{version}/plugins/${plugin}/skins" ]; then
-            continue
+        if [ -d "%{name}-plugin-${plugin}-skin-$skin-%{version}/plugins/${plugin}/skins/$skin" ]; then
+            %{__install} -d %{buildroot}%{plugindir}/$plugin/skins/
+            cp -a %{name}-plugin-${plugin}-skin-$skin-%{version}/plugins/${plugin}/skins/$skin %{buildroot}%{plugindir}/$plugin/skins/.
+
+            new_files > plugin-$plugin-skin-$skin.files
+
+            echo "== Files for skin $plugin-$skin: =="
+            cat plugin-$plugin-skin-$skin.files
+            echo "==========================="
         fi
 
-        %{__install} -d %{buildroot}%{plugindir}/$plugin/skins/
-        cp -a %{name}-plugin-${plugin}-skin-$skin-%{version}/plugins/${plugin}/skins/$skin %{buildroot}%{plugindir}/$plugin/skins/.
-
-        new_files > plugin-$plugin-skin-$skin.files
-
-        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
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-$plugin-skin-$skin-assets-%{version}|$asset_path|g"))
             %{__mkdir_p} ${asset_loc}
             %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
-        done
+        done || :
 
         new_files > plugin-$plugin-skin-$skin-assets.files