Fix bugzilla 436675. Separate menu entry into desktop subpackage.

This commit is contained in:
Permaine Cheung 2008-03-10 13:59:44 +00:00
parent 3dca6f4a22
commit 2f294798f1

View File

@ -32,7 +32,7 @@
Name: bsh Name: bsh
Version: 1.3.0 Version: 1.3.0
Release: 12jpp.2%{?dist} Release: 12jpp.3%{?dist}
Epoch: 0 Epoch: 0
Summary: Lightweight Scripting for Java Summary: Lightweight Scripting for Java
License: LGPL License: LGPL
@ -107,6 +107,14 @@ Requires: /usr/bin/env
%description demo %description demo
Demonstrations and samples for %{name}. Demonstrations and samples for %{name}.
%package desktop
Summary: %{name} integration for the desktop
Group: Development/Java
Requires: %{name} = %{epoch}:%{version}-%{release}
%description desktop
Contains a menu entry for %{name}.
%prep %prep
%setup -q -n BeanShell %setup -q -n BeanShell
%patch0 -p1 %patch0 -p1
@ -274,11 +282,13 @@ cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post desktop
touch --no-create %{_datadir}/icons/hicolor touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi fi
%post
%update_maven_depmap %update_maven_depmap
%if %{gcj_support} %if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ] if [ -x %{_bindir}/rebuild-gcj-db ]
@ -288,11 +298,13 @@ fi
%endif %endif
exit 0 exit 0
%postun %postun desktop
touch --no-create %{_datadir}/icons/hicolor touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi fi
%postun
%update_maven_depmap %update_maven_depmap
%if %{gcj_support} %if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ] if [ -x %{_bindir}/rebuild-gcj-db ]
@ -306,12 +318,9 @@ exit 0
%defattr(-,root,root) %defattr(-,root,root)
%doc src/Changes.html src/License.txt src/README.txt %doc src/Changes.html src/License.txt src/README.txt
%attr(0755,root,root) %{_bindir}/%{name} %attr(0755,root,root) %{_bindir}/%{name}
%attr(0755,root,root) %{_bindir}/%{name}-desktop
%attr(0755,root,root) %{_bindir}/%{name}doc %attr(0755,root,root) %{_bindir}/%{name}doc
%{_javadir}/* %{_javadir}/*
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%{_datadir}/applications/*%{name}-desktop.desktop
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%{_datadir}/%{name}/webapps %{_datadir}/%{name}/webapps
%{_datadir}/maven2/poms/* %{_datadir}/maven2/poms/*
%{_mavendepmapfragdir} %{_mavendepmapfragdir}
@ -334,7 +343,15 @@ exit 0
%doc tests/README.txt tests/Interactive/README %doc tests/README.txt tests/Interactive/README
%{_datadir}/%{name}/* %{_datadir}/%{name}/*
%files desktop
%attr(0755,root,root) %{_bindir}/%{name}-desktop
%{_datadir}/applications/*%{name}-desktop.desktop
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%changelog %changelog
* Mon Mar 10 2008 Permaine Cheung <pcheung@redhat.com> 0:1.3.0-12jpp.3
- Fix bugzilla 436675. Separate menu entry into desktop subpackage.
* Thu Mar 06 2008 Permaine Cheung <pcheung@redhat.com> 0:1.3.0-12jpp.2 * Thu Mar 06 2008 Permaine Cheung <pcheung@redhat.com> 0:1.3.0-12jpp.2
- Fix bugzilla 417491. Thanks Ville Skytta for the patch. - Fix bugzilla 417491. Thanks Ville Skytta for the patch.
- Add menu entry and startup script for bsh desktop. - Add menu entry and startup script for bsh desktop.