SHA256
1
0
forked from pool/uim

Accepting request 72337 from home:dimstar:branches:M17N

Inroduce build_applet define / disable the applet on Factory - This build DOES work with xemacs from Factory, but not with xemacs from M17N, where xemacs has broken Requires (it misses libgpm.so.2 and a bunch of others). with xemcas from M17N xemacs fails with missing shared lib (locally tested with osc build -x gpm; it is wrong to buidlrequire gpm here though

OBS-URL: https://build.opensuse.org/request/show/72337
OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=16
This commit is contained in:
Stephan Kulow 2011-05-31 17:47:04 +00:00 committed by Git OBS Bridge
parent a5e0254e0f
commit 0e0580cec1
2 changed files with 18 additions and 3 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue May 31 16:23:54 UTC 2011 - dimstar@opensuse.org
- Introduce a build_applet define, which is set to 1 on openSUSE up
to 11.4. For current Factory, we need to disable the applet, as
it is not (yet) ported to the new libpanelapplet-4.0
infrastructure of Gnome3.
- Move the gnome applet actually to the gtk package (when building
the applet).
-------------------------------------------------------------------
Wed Mar 9 12:29:07 CET 2011 - tiwai@suse.de

View File

@ -15,7 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# The applet does not work currently on Factory, as it has not been ported to libpanelapplet-4.0 yet.
%define build_applet 0%{?suse_version} <= 1140
Name: uim
BuildRequires: anthy-devel
@ -23,7 +24,6 @@ BuildRequires: canna-devel
BuildRequires: emacs-x11
BuildRequires: emacs-x11
BuildRequires: gcc-c++
BuildRequires: gnome-panel-devel
BuildRequires: intltool
BuildRequires: libexpat-devel
BuildRequires: libgnomeui-devel
@ -36,6 +36,9 @@ BuildRequires: pkgconfig(gtk+-2.0)
%else
BuildRequires: gtk2-devel
%endif
%if %{?build_applet}
BuildRequires: gnome-panel-devel
%endif
BuildRequires: qt3-devel
BuildRequires: update-desktop-files
BuildRequires: xemacs
@ -242,7 +245,6 @@ uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode ha
%dir %{_prefix}/lib/uim
%endif
%{_prefix}/lib/uim/uim-helper-server
%{_prefix}/lib/uim/uim-toolbar-applet
%{_prefix}/lib/uim/uim-candwin-gtk
%dir %{_libdir}/uim/plugin/
%{_libdir}/uim/plugin/*.so
@ -267,7 +269,10 @@ uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode ha
%{_bindir}/uim-toolbar-gtk
%{_bindir}/uim-toolbar-gtk-systray
%{_bindir}/uim-pref-gtk
%if %{build_applet}
%{_prefix}/lib/uim/uim-toolbar-applet
%{_libdir}/bonobo/servers/*.server
%endif
%{_libdir}/gtk-*/*/immodules/*.so
%files -n uim-qt -f uim-chardict-qt.lang