remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
- clean up spec to follow current guidelines
This commit is contained in:
parent
369ec0c3cb
commit
8f50f3371d
28
bsh.spec
28
bsh.spec
@ -30,7 +30,7 @@
|
||||
|
||||
Name: bsh
|
||||
Version: 1.3.0
|
||||
Release: 23%{?dist}
|
||||
Release: 24%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Lightweight Scripting for Java
|
||||
License: (SPL or LGPLv2+) and Public Domain
|
||||
@ -53,7 +53,6 @@ Requires: jpackage-utils >= 0:1.7.5-3.9
|
||||
URL: http://www.beanshell.org/
|
||||
Group: Development/Libraries
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
%description
|
||||
BeanShell is a small, free, embeddable, Java source interpreter with
|
||||
@ -142,7 +141,6 @@ $ant dist
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# jars
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
||||
install -m 644 dist/%{name}-%{version}.jar \
|
||||
@ -187,7 +185,7 @@ 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 \
|
||||
desktop-file-install --mode=644 \
|
||||
--dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
|
||||
convert src/bsh/util/lib/icon.gif \
|
||||
@ -277,29 +275,25 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF
|
||||
EOF
|
||||
cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post utils
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%post
|
||||
%update_maven_depmap
|
||||
|
||||
%postun utils
|
||||
if [ $1 -eq 0 ] ; then
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
/usr/bin/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 || :
|
||||
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc src/Changes.html src/License.txt src/README.txt
|
||||
%{_javadir}/*
|
||||
%dir %{_datadir}/%{name}
|
||||
@ -309,27 +303,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%ifnarch ppc64 s390x
|
||||
%files manual
|
||||
%defattr(-,root,root)
|
||||
%doc docs/*
|
||||
%endif
|
||||
|
||||
%files javadoc
|
||||
%defattr(-,root,root)
|
||||
%{_javadocdir}/%{name}-%{version}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%files demo
|
||||
%defattr(-,root,root)
|
||||
%doc tests/README.txt tests/Interactive/README
|
||||
%{_datadir}/%{name}/*
|
||||
|
||||
%files utils
|
||||
%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
|
||||
|
||||
%changelog
|
||||
* Thu Feb 14 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 0:1.3.0-24
|
||||
- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
|
||||
- clean up spec to follow current guidelines
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3.0-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user