rpms/bsh
5
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
- Bring icon cache scriptlets up to date with current guidelines.
This commit is contained in:
Ville Skyttä 2010-11-25 22:40:38 +02:00
parent 536318dd88
commit 39d249054a
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
bsh.spec
View File

@ -30,7 +30,7 @@
Name: bsh Name: bsh
Version: 1.3.0 Version: 1.3.0
Release: 16%{?dist} Release: 17%{?dist}
Epoch: 0 Epoch: 0
Summary: Lightweight Scripting for Java Summary: Lightweight Scripting for Java
License: SPL or LGPLv2+ License: SPL or LGPLv2+
@ -98,13 +98,18 @@ Requires: /usr/bin/env
%description demo %description demo
Demonstrations and samples for %{name}. Demonstrations and samples for %{name}.
%package desktop %package utils
Summary: Desktop integraton for %{name} Summary: %{name} utilities
Group: Development/Libraries Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release} 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 %description utils
Contains a menu entry for %{name}. %{name} utilities.
%prep %prep
%setup -q -n BeanShell %setup -q -n BeanShell
@ -271,29 +276,27 @@ cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post desktop %post utils
touch --no-create %{_datadir}/icons/hicolor touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi
%post %post
%update_maven_depmap %update_maven_depmap
%postun desktop %postun utils
touch --no-create %{_datadir}/icons/hicolor if [ $1 -eq 0 ] ; then
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi fi
%postun %postun
%update_maven_depmap %update_maven_depmap
%posttrans utils
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files %files
%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}doc
%{_javadir}/* %{_javadir}/*
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%{_datadir}/%{name}/webapps %{_datadir}/%{name}/webapps
@ -316,12 +319,17 @@ fi
%doc tests/README.txt tests/Interactive/README %doc tests/README.txt tests/Interactive/README
%{_datadir}/%{name}/* %{_datadir}/%{name}/*
%files desktop %files utils
%attr(0755,root,root) %{_bindir}/%{name}-desktop %defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/%{name}*
%{_datadir}/applications/*%{name}-desktop.desktop %{_datadir}/applications/*%{name}-desktop.desktop
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%changelog %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 * Thu Nov 25 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.3.0-16
- Fix pom filenames (Resolves rhbz#655791) - Fix pom filenames (Resolves rhbz#655791)
- Fix xsl errors when building docs - Fix xsl errors when building docs