Accepting request 195827 from home:dimstar:branches:M17N
no more gnome-panel OBS-URL: https://build.opensuse.org/request/show/195827 OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=45
This commit is contained in:
parent
2269dd9e55
commit
951d2f6d80
10
uim.changes
10
uim.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 15:52:16 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
- Introduce build_applet defines, set to true up to openSUSE 12.3:
|
||||
+ Specifies wether to build the gnome-panel applet, resp
|
||||
uim-applet-gnome subpackage.
|
||||
+ Conditionally BuildRequires gnome-panel-devel
|
||||
+ If evaluated to false, obsoletes uim-applet-gnome for clean
|
||||
upgrades.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 16 15:36:23 UTC 2013 - coolo@suse.com
|
||||
|
||||
|
11
uim.spec
11
uim.spec
@ -18,6 +18,7 @@
|
||||
|
||||
%define build_gtk3 (0%{?suse_version} >= 1140)
|
||||
%define is_gnome3 (0%{?suse_version} > 1140)
|
||||
%define build_applet (0%{?suse_version} < 1310)
|
||||
|
||||
Name: uim
|
||||
Version: 1.8.5
|
||||
@ -39,7 +40,9 @@ BuildRequires: canna-devel
|
||||
BuildRequires: emacs-x11
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
%if %{build_applet}
|
||||
BuildRequires: gnome-panel-devel
|
||||
%endif
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libedit-devel
|
||||
@ -62,6 +65,10 @@ Recommends: %{name}-gtk3 = %{version}
|
||||
Recommends: %{name}-qt4 = %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires(pre): %{_bindir}/touch
|
||||
%if ! (%{build_applet})
|
||||
# If we can't build the applet, we need to ensure we can cleanly 'upgrade' Obsoleting the applet.
|
||||
Obsoletes: %{name}-applet-gnome <= %{version}
|
||||
%endif
|
||||
|
||||
%description
|
||||
Uim is a multilingual input method framework. Uim's goal is to
|
||||
@ -100,6 +107,7 @@ Provides: locale(gtk3:ja)
|
||||
GTK+3.0 IM module for uim
|
||||
%endif
|
||||
|
||||
%if %{build_applet}
|
||||
%package applet-gnome
|
||||
Summary: GNOME applet for uim
|
||||
Group: System/I18n/Japanese
|
||||
@ -110,6 +118,7 @@ Provides: locale(gnome-libs:ja)
|
||||
|
||||
%description applet-gnome
|
||||
GNOME applet for uim
|
||||
%endif
|
||||
|
||||
%package qt4
|
||||
Summary: Qt4 input module plugin for uim
|
||||
@ -278,6 +287,7 @@ uim-module-manager --register \
|
||||
%{_libdir}/gtk-3*/*/immodules/*.so
|
||||
%endif
|
||||
|
||||
%if %{build_applet}
|
||||
%files applet-gnome
|
||||
%defattr(-, root, root)
|
||||
%if %{is_gnome3}
|
||||
@ -288,6 +298,7 @@ uim-module-manager --register \
|
||||
%{_prefix}/lib/uim/uim-toolbar-applet
|
||||
%{_libdir}/bonobo/servers/*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files qt4 -f uim-chardict-qt.lang
|
||||
%defattr(-, root, root)
|
||||
|
Loading…
Reference in New Issue
Block a user