[squeak-vm] Removed desktop file
Jaroslav Škarvada
jskarvad at fedoraproject.org
Fri Dec 21 11:24:01 UTC 2012
commit a93e0f8f834e1f38fc05cfe0de0755db51eee3b5
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Fri Dec 21 12:23:56 2012 +0100
Removed desktop file
Resolves: rhbz#544256
squeak-vm.spec | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/squeak-vm.spec b/squeak-vm.spec
index 2daf342..8c9d8be 100644
--- a/squeak-vm.spec
+++ b/squeak-vm.spec
@@ -8,7 +8,7 @@
Name: squeak-vm
Version: %{vmver}
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The Squeak virtual machine
Group: Development/Languages
@@ -29,8 +29,6 @@ Obsoletes: %{name}-nonXOplugins < 4.10.2.2614-1
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
Requires: xorg-x11-apps
BuildRequires: cmake
@@ -58,9 +56,6 @@ This package contains just the Squeak virtual machine.
# Fix libdir
sed -i 's|libdir="${prefix}/lib/squeak"|libdir="%{_libdir}/squeak"|' unix/cmake/squeak.in
-# Fix squeak.desktop
-sed -i 's/MySqueak/Squeak/g;s/mysqueak/squeak/g' squeak.desktop
-
%build
mkdir -p bld
cd bld
@@ -78,7 +73,6 @@ rm -rf %{buildroot}%{_prefix}/doc/squeak
# install the desktop stuff
install -D --mode=u=rw,go=r squeak.xml %{buildroot}%{_datadir}/mime/packages/squeak.xml
-install -D --mode=u=rw,go=r squeak.desktop %{buildroot}%{_datadir}/applications/squeak.desktop
install -D --mode=u=rw,go=r squeak.png %{buildroot}%{_datadir}/pixmaps/squeak.png
%global icons_dir %{buildroot}%{_datadir}/icons/gnome
@@ -104,7 +98,6 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
%postun
touch --no-create %{_datadir}/icons/gnome || :
@@ -112,7 +105,6 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
%files
%defattr(-,root,root,-)
@@ -176,6 +168,10 @@ update-desktop-database &> /dev/null || :
%{_datadir}/icons/gnome/*/mimetypes/*.png
%changelog
+* Fri Dec 21 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 4.10.2.2614-5
+- Removed desktop file
+ Resolves: rhbz#544256
+
* Mon Nov 26 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 4.10.2.2614-4
- Another upgrade path fix
More information about the scm-commits
mailing list