Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 75

roundcubemail-plugins-kolab.spec Changed

@@ -905,32 +905,32 @@
 popd
 
 for plugin in $(find %{name}-%{version}/plugins -mindepth 1 -maxdepth 1 -type d | sort); do
-    target_dir=$(echo $plugin | %{__sed} -e "s|%{name}-%{version}|%{name}-plugin-$(basename $plugin)-%{version}|g")
-    %{__mkdir_p} $(dirname $target_dir)
-    cp -av ${plugin} $target_dir
+    target_dir=$(echo ${plugin} | %{__sed} -e "s|%{name}-%{version}|%{name}-plugin-$(basename ${plugin})-%{version}|g")
+    %{__mkdir_p} $(dirname ${target_dir})
+    cp -av ${plugin} ${target_dir}
 
     (
-        echo "%package -n roundcubemail-plugin-$(basename $plugin)"
-        echo "Summary:        Plugin $(basename $plugin)"
+        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(plugin-$(basename $plugin)-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-        echo "Requires:       roundcubemail(plugin-$(basename $plugin)-skin) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-        echo "Provides:       roundcubemail(plugin-$(basename $plugin)) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+        echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+        echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+        echo "Provides:       roundcubemail(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         echo ""
-        echo "%description -n roundcubemail-plugin-$(basename $plugin)"
-        echo "Plugin $(basename $plugin)"
+        echo "%description -n roundcubemail-plugin-$(basename ${plugin})"
+        echo "Plugin $(basename ${plugin})"
         echo ""
     ) >> plugins.packages
 
     (
-        echo "%files -n roundcubemail-plugin-$(basename $plugin) -f plugin-$(basename $plugin).files"
+        echo "%files -n roundcubemail-plugin-$(basename ${plugin}) -f plugin-$(basename ${plugin}).files"
         echo "%defattr(-,root,root,-)"
         echo ""
     ) >> plugins.files
 
     (
-        echo "%pre -n roundcubemail-plugin-$(basename $plugin)"
+        echo "%pre -n roundcubemail-plugin-$(basename ${plugin})"
         echo "if [ ! -f \"%%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted\" ]; then"
         echo "    %%{__rm} -f \"%%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted\""
         echo "fi"
@@ -938,7 +938,7 @@
     ) >> plugins.pre
 
     (
-        echo "%posttrans -n roundcubemail-plugin-$(basename $plugin)"
+        echo "%posttrans -n roundcubemail-plugin-$(basename ${plugin})"
         echo "if [ ! -f \"%%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted\" ]; then"
         echo "    if [ -f \"%%{php_inidir}/apc.ini\" ]; then"
         echo "        if [ ! -z \"\$(grep ^apc.enabled=1 %%{php_inidir}/apc.ini)\" ]; then"
@@ -954,7 +954,7 @@
         echo "fi"
         echo ""
         if [ ! -z "$(find ${plugin} -type d -name \"SQL\")" ]; then
-            echo "for dir in \$(find /usr/share/roundcubemail/plugins/$(basename $plugin)/ -type d -name \"SQL\"); do"
+            echo "for dir in \$(find /usr/share/roundcubemail/plugins/$(basename ${plugin})/ -type d -name \"SQL\"); do"
             echo "    # Skip plugins with multiple drivers and no kolab driver"
             echo "    if [ ! -z \"\$(echo \$dir | grep driver)\" ]; then"
             echo "        if [ -z \"\$(echo \$dir | grep kolab)\" ]; then"
@@ -964,7 +964,7 @@
             echo ""
             echo "    /usr/share/roundcubemail/bin/updatedb.sh \\"
             echo "        --dir \$dir \\"
-            echo "        --package $(basename $plugin) \\"
+            echo "        --package $(basename ${plugin}) \\"
             echo "        >/dev/null 2>&1 || :"
             echo ""
             echo "done"
@@ -973,66 +973,66 @@
     ) >> plugins.post
 
     (
-        echo "%package -n roundcubemail-plugin-$(basename $plugin)-assets"
-        echo "Summary:        Plugin $(basename $plugin) Assets"
+        echo "%package -n roundcubemail-plugin-$(basename ${plugin})-assets"
+        echo "Summary:        Plugin $(basename ${plugin}) Assets"
         echo "Group:          Applications/Internet"
-        echo "Requires:       roundcubemail(plugin-$(basename $plugin)) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-        echo "Provides:       roundcubemail(plugin-$(basename $plugin)-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+        echo "Requires:       roundcubemail(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+        echo "Provides:       roundcubemail(plugin-$(basename ${plugin})-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         echo ""
-        echo "%description -n roundcubemail-plugin-$(basename $plugin)-assets"
-        echo "Plugin $(basename $plugin) Assets"
+        echo "%description -n roundcubemail-plugin-$(basename ${plugin})-assets"
+        echo "Plugin $(basename ${plugin}) Assets"
         echo ""
     ) >> plugins-assets.packages
 
     (
-        echo "%files -n roundcubemail-plugin-$(basename $plugin)-assets -f plugin-$(basename $plugin)-assets.files"
+        echo "%files -n roundcubemail-plugin-$(basename ${plugin})-assets -f plugin-$(basename ${plugin})-assets.files"
         echo "%defattr(-,root,root,-)"
         echo ""
     ) >> plugins-assets.files
 
     for skin in larry classic; 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)
-            %{__mv} $dir $starget_dir
+        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})
+            %{__mv} $dir ${starget_dir}
 
             (
-                echo "%package -n roundcubemail-plugin-$(basename $plugin)-skin-$skin"
-                echo "Summary:        Plugin $(basename $plugin) / Skin $skin"
+                echo "%package -n roundcubemail-plugin-$(basename ${plugin})-skin-${skin}"
+                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(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}"
+                echo "Requires:       roundcubemail(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+                echo "Requires:       roundcubemail(skin-${skin}) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+                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}"
                 echo ""
-                echo "%description -n roundcubemail-plugin-$(basename $plugin)-skin-$skin"
-                echo "Plugin $(basename $plugin) / Skin $skin"
+                echo "%description -n roundcubemail-plugin-$(basename ${plugin})-skin-${skin}"
+                echo "Plugin $(basename ${plugin}) / Skin ${skin}"
                 echo ""
             ) >> plugins-skins.packages
 
             (
-                echo "%files -n roundcubemail-plugin-$(basename $plugin)-skin-$skin -f plugin-$(basename $plugin)-skin-$skin.files"
+                echo "%files -n roundcubemail-plugin-$(basename ${plugin})-skin-${skin} -f plugin-$(basename ${plugin})-skin-${skin}.files"
                 echo "%defattr(-,root,root,-)"
                 echo ""
             ) >> plugins-skins.files
 
             (
-                echo "%package -n roundcubemail-plugin-$(basename $plugin)-skin-$skin-assets"
-                echo "Summary:        Plugin $(basename $plugin) / Skin $skin (Assets)"
+                echo "%package -n roundcubemail-plugin-$(basename ${plugin})-skin-${skin}-assets"
+                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(plugin-$(basename $plugin)-skin-$skin) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Provides:       roundcubemail(plugin-$(basename $plugin)-skin-$skin-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+                echo "Requires:       roundcubemail(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+                echo "Requires:       roundcubemail(skin-${skin}) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+                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 ""
-                echo "%description -n roundcubemail-plugin-$(basename $plugin)-skin-$skin-assets"
-                echo "Plugin $(basename $plugin) / Skin $skin (Assets Package)"
+                echo "%description -n roundcubemail-plugin-$(basename ${plugin})-skin-${skin}-assets"
+                echo "Plugin $(basename ${plugin}) / Skin ${skin} (Assets Package)"
                 echo ""
             ) >> plugins-skins-assets.packages
 
             (
-                echo "%files -n roundcubemail-plugin-$(basename $plugin)-skin-$skin-assets -f plugin-$(basename $plugin)-skin-$skin-assets.files"
+                echo "%files -n roundcubemail-plugin-$(basename ${plugin})-skin-${skin}-assets -f plugin-$(basename ${plugin})-skin-${skin}-assets.files"
                 echo "%defattr(-,root,root,-)"
                 echo ""
             ) >> plugins-skins-assets.files
@@ -1090,89 +1090,18 @@
 
 %{__mkdir_p} ${asset_path}
 
-orig_dir="%{name}-%{version}"
-asset_dir="%{name}-assets-%{version}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
-
-# Remove the skins and installer directories from $orig_dir
-%{__rm} -rf $orig_dir/{installer,skins}
-
-echo "Original directory for core: $orig_dir"
-echo "Asset directory for core: $asset_dir"
-
-# Compress the CSS
-for file in `find $orig_dir -type f -name "*.css" | grep -vE "/(plugins|skins)/"`; do
-    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|$orig_dir|$asset_dir|g"))
-    %{__mkdir_p} ${asset_loc}
-    cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \
-        %{__rm} -rf ${file} || \
-        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
-done
-
-# Compress the JS, but not the already minified
-for file in `find $orig_dir -type f -name "*.js" ! -name "*.min.js" | grep -vE "/(plugins|skins)/"`; do
-    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|$orig_dir|$asset_dir|g"))
-    %{__mkdir_p} ${asset_loc}
-    uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \
-        %{__rm} -rf ${file} || \
-        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
-done
-