- Rename -desktop to -utils, move shell scripts and menu entry to it (#417491).

- Bring icon cache scriptlets up to date with current guidelines.

bsh.spec

@@ -30,7 +30,7 @@
 
 Name:           bsh
 Version:        1.3.0
-Release:        16%{?dist}
+Release:        17%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
 License:        SPL or LGPLv2+
@@ -98,13 +98,18 @@ Requires:       /usr/bin/env
 %description demo
 Demonstrations and samples for %{name}.
 
-%package desktop
-Summary:        Desktop integraton for %{name}
-Group:          Development/Libraries
+%package utils
+Summary:        %{name} utilities
+Group:          Development/Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Provides:       %{name}-desktop = %{epoch}:%{version}-%{release}
+Obsoletes:      %{name}-desktop < 0:1.3.0-17
+# So that yum will pull this in on base package upgrades from < 0:1.3.0-17
+# (bsh and bshdoc scripts moved here in -17):
+Obsoletes:      %{name} < 0:1.3.0-17
 
-%description desktop
-Contains a menu entry for %{name}.
+%description utils
+%{name} utilities.
 
 %prep
 %setup -q -n BeanShell
@@ -271,29 +276,27 @@ cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post desktop
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
+%post utils
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %post
 %update_maven_depmap
 
-%postun desktop
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+%postun utils
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %postun
 %update_maven_depmap
 
+%posttrans utils
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files
 %defattr(-,root,root)
 %doc src/Changes.html src/License.txt src/README.txt
-%attr(0755,root,root) %{_bindir}/%{name}
-%attr(0755,root,root) %{_bindir}/%{name}doc
 %{_javadir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/webapps
@@ -316,12 +319,17 @@ fi
 %doc tests/README.txt tests/Interactive/README
 %{_datadir}/%{name}/*
 
-%files desktop
-%attr(0755,root,root) %{_bindir}/%{name}-desktop
+%files utils
+%defattr(-,root,root)
+%attr(0755,root,root) %{_bindir}/%{name}*
 %{_datadir}/applications/*%{name}-desktop.desktop
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 
 %changelog
+* Thu Nov 25 2010 Ville Skyttä <ville.skytta@iki.fi> - 0:1.3.0-17
+- Rename -desktop to -utils, move shell scripts and menu entry to it (#417491).
+- Bring icon cache scriptlets up to date with current guidelines.
+
 * Thu Nov 25 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.3.0-16
 - Fix pom filenames (Resolves rhbz#655791)
 - Fix xsl errors when building docs