Attachment 282351 Details for Bug 417491 – Add bsh-desktop script and menu entry, fix scriptlet exit statuses

[patch] Add bsh-desktop script and menu entry, fix scriptlet exit statuses

bsh.patch (text/plain), 4.20 KB, created by Ville Skyttä on 2007-12-09 20:50:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2007-12-09 20:50:19 UTC

Size: 4.20 KB

patch

obsolete

>? BeanShell
>? bsh-1.3.0-10jpp.1.fc9.src.rpm
>Index: bsh-desktop.desktop
>===================================================================
>RCS file: bsh-desktop.desktop
>diff -N bsh-desktop.desktop
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ bsh-desktop.desktop	9 Dec 2007 20:48:39 -0000
>@@ -0,0 +1,9 @@
>+[Desktop Entry]
>+Name=BeanShell Desktop
>+Exec=bsh-desktop
>+Icon=bsh
>+Terminal=false
>+Type=Application
>+StartupWMClass=bsh-Console
>+Categories=Development;Java;
>+Version=1.0
>Index: bsh.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/bsh/devel/bsh.spec,v
>retrieving revision 1.13
>diff -u -r1.13 bsh.spec
>--- bsh.spec	26 Apr 2007 16:20:20 -0000	1.13
>+++ bsh.spec	9 Dec 2007 20:48:39 -0000
>@@ -34,7 +34,7 @@
> 
> Name:           bsh
> Version:        1.3.0
>-Release:        10jpp.1%{?dist}
>+Release:        10jpp.2%{?dist}
> Epoch:          0
> Summary:        Lightweight Scripting for Java
> License:        LGPL
>@@ -42,9 +42,10 @@
> #cvs -d:pserver:anonymous@beanshell.cvs.sourceforge.net:/cvsroot/beanshell login
> #cvs -z3 -d:pserver:anonymous@beanshell.cvs.sourceforge.net:/cvsroot/beanshell export -r rel_1_3_0_final BeanShell
> #tar cjf bsh-1.3.0-src.tar.bz2 BeanShell
>+Source1:        %{name}-desktop.desktop
> Patch0:         %{name}-build.patch
> #Patch1:         %{name}-readline.patch
>-BuildRequires:  ant, bsf, ant-trax
>+BuildRequires:  ant, bsf, ant-trax, ImageMagick, desktop-file-utils
> Requires:       bsf
> Requires:       jpackage-utils >= 0:1.6
> #BuildRequires:  libreadline-java
>@@ -148,6 +149,12 @@
> install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
> cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
> ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>+# menu entry
>+desktop-file-install --vendor=fedora --mode=644 \
>+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
>+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
>+convert src/bsh/util/lib/icon.gif \
>+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/bsh.png
> 
> # demo
> for i in `find tests -name \*.bsh`; do
>@@ -176,10 +183,11 @@
> # scripts
> install -d $RPM_BUILD_ROOT%{_bindir}
> 
>-cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF
>+function bsh_script() {
>+cat > $RPM_BUILD_ROOT%{_bindir}/$1 << EOF
> #!/bin/sh
> #
>-# %{name} script
>+# $1 script
> # JPackage Project (http://jpackage.sourceforge.net)
> 
> # Source functions library
>@@ -196,7 +204,7 @@
> fi
> 
> # Configuration
>-MAIN_CLASS=bsh.Interpreter
>+MAIN_CLASS=$2
> if [ -n "\$BSH_DEBUG" ]; then
>   BASE_FLAGS=-Ddebug=true
> fi
>@@ -218,6 +226,10 @@
> # Let's start
> run "\$@"
> EOF
>+}
>+
>+bsh_script bsh bsh.Interpreter
>+bsh_script bsh-desktop bsh.Console
> 
> cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF
> #!/usr/bin/env %{_bindir}/%{name}
>@@ -231,29 +243,42 @@
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>-%if %{gcj_support}
> %post
>+touch --no-create %{_datadir}/icons/hicolor
>+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
>+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
>+fi
>+%if %{gcj_support}
> if [ -x %{_bindir}/rebuild-gcj-db ]
> then
>   %{_bindir}/rebuild-gcj-db
> fi
> %endif
>+exit 0
> 
>-%if %{gcj_support}
> %postun
>+touch --no-create %{_datadir}/icons/hicolor
>+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
>+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
>+fi
>+%if %{gcj_support}
> if [ -x %{_bindir}/rebuild-gcj-db ]
> then
>   %{_bindir}/rebuild-gcj-db
> fi
> %endif
>+exit 0
> 
> %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}-desktop
> %attr(0755,root,root) %{_bindir}/%{name}doc
> %{_javadir}/*
> %dir %{_datadir}/%{name}
>+%{_datadir}/applications/*%{name}-desktop.desktop
>+%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
> 
> %if %{gcj_support}
> %attr(-,root,root) %{_libdir}/gcj/%{name}
>@@ -274,6 +299,10 @@
> %{_datadir}/%{name}/*
> 
> %changelog
>+* Sun Dec  9 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:1.3.0-10jpp.2
>+- Add menu entry and startup script for bsh desktop.
>+- Ensure scriptlets exit with zero exit status.
>+
> * Fri Mar 16 2007 Permaine Cheung <pcheung@redhat.com> 0:1.3.0-10jpp.1
> - Merge with upstream
> - Removed unapplied patch and moved buildroot removal from prep to install,

Actions: View | Diff

Attachments on bug 417491: 282351 | 297503 | 348938 | 457862