rpms/scim/devel scim.spec,1.86,1.87
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Fri May 4 08:52:56 UTC 2007
- Previous message (by thread): rpms/python-mecab/devel MeCab-license-Fedora, NONE, 1.1 python-mecab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/python-mecab/FC-6 MeCab-license-Fedora, NONE, 1.1 python-mecab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783
Modified Files:
scim.spec
Log Message:
- completely remove scim-setup.desktop to stop "Applications -> Other"
appearing (#238966)
Resolves: #238966
Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- scim.spec 2 May 2007 07:35:30 -0000 1.86
+++ scim.spec 4 May 2007 08:52:14 -0000 1.87
@@ -3,7 +3,7 @@
Name: scim
Version: 1.4.5
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Smart Common Input Method platform
License: LGPL
@@ -15,7 +15,7 @@
Source3: scim-system-config
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, libXt-devel, desktop-file-utils
+BuildRequires: gtk2-devel, libXt-devel
# for autoreconf
Buildrequires: autoconf automake gettext libtool
%if %{snapshot}
@@ -140,15 +140,8 @@
# remove .la files
find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
-# install setup panel
-desktop-file-install \
- --delete-original \
- --vendor fedora \
- --remove-category Applications \
- --remove-category Settings \
- --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \
- ${RPM_BUILD_ROOT}/%{_datadir}/applications/scim-setup.desktop
-
+# remove scim-setup.desktop file since it is confusing with im-chooser
+rm ${RPM_BUILD_ROOT}/%{_datadir}/applications/scim-setup.desktop
# remove capplet
rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop
@@ -217,7 +210,6 @@
%{_libdir}/scim-1.0/%{scim_api}/SetupUI
%{_datadir}/scim
%{_datadir}/pixmaps/*
-%{_datadir}/applications/fedora-scim-setup.desktop
%dir %{_xinputdir}
%config(noreplace) %{_xinputconf}
@@ -250,9 +242,13 @@
%changelog
+* Fri May 4 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-18
+- completely remove scim-setup.desktop to stop "Applications -> Other"
+ appearing (#238966)
+
* Wed May 2 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-17
- remove scim-setup from the desktop preferences menu since it is confusing
- with im-chooser and can be started directly from the scim command menu
+ with im-chooser and can be started directly from the scim command menu
* Tue May 1 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-16
- unrevert the last changes to initial-locale-hotkey-186861.patch to allow
- Previous message (by thread): rpms/python-mecab/devel MeCab-license-Fedora, NONE, 1.1 python-mecab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/python-mecab/FC-6 MeCab-license-Fedora, NONE, 1.1 python-mecab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list