- fltk-fluid duplicate .desktop file (#508553)

- optimize scriptlets
This commit is contained in:
Rex Dieter 2009-06-28 15:50:09 +00:00
parent dd51ba5416
commit 4798ec104f

View File

@ -4,7 +4,7 @@
Summary: C++ user interface toolkit
Name: fltk
Version: 1.1.9
Release: 4%{?dist}
Release: 5%{?dist}
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
License: LGPLv2+ with exceptions
@ -140,10 +140,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/fltk-config \
$RPM_BUILD_ROOT%{_bindir}/fltk-config-%{arch}
install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fltk-config
desktop-file-install --vendor="%{name}" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
# docs
rm -rf __docs
mv $RPM_BUILD_ROOT%{_docdir}/fltk __docs
@ -154,7 +150,8 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
%check
make test ||:
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
make test
%clean
@ -166,14 +163,18 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig
%post fluid
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun fluid
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null
touch --no-create %{_datadir}/icons/hicolor &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
fi
%posttrans fluid
update-desktop-database -q &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files
@ -207,13 +208,17 @@ update-desktop-database >& /dev/null ||:
%defattr(-,root,root,-)
%{_bindir}/fluid
%{_mandir}/man1/fluid.1*
%{_datadir}/applications/*fluid.desktop
%{_datadir}/applications/fluid.desktop
%{_datadir}/icons/hicolor/*/*/*
# FIXME
# FIXME, add according to new mime spec
%{_datadir}/mimelnk/*/*.desktop
%changelog
* Sun Jun 28 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.9-5
- fltk-fluid duplicate .desktop file (#508553)
- optimize scriptlets
* Wed May 13 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.9-4
- unbreak fltk-config --ldstaticflags (#500201)
- (another?) gcc44 patch