Hello community, here is the log from the commit of package uim for openSUSE:Factory checked in at 2013-08-22 10:55:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uim (Old) and /work/SRC/openSUSE:Factory/.uim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uim" Changes: -------- --- /work/SRC/openSUSE:Factory/uim/uim.changes 2013-07-24 15:31:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.uim.new/uim.changes 2013-08-22 10:55:15.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 21 15:52:16 UTC 2013 - [email protected] + +- 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. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uim.spec ++++++ --- /var/tmp/diff_new_pack.c7rBm3/_old 2013-08-22 10:55:16.000000000 +0200 +++ /var/tmp/diff_new_pack.c7rBm3/_new 2013-08-22 10:55:16.000000000 +0200 @@ -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: 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}-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 @@ 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 @@ %description applet-gnome GNOME applet for uim +%endif %package qt4 Summary: Qt4 input module plugin for uim @@ -278,6 +287,7 @@ %{_libdir}/gtk-3*/*/immodules/*.so %endif +%if %{build_applet} %files applet-gnome %defattr(-, root, root) %if %{is_gnome3} @@ -288,6 +298,7 @@ %{_prefix}/lib/uim/uim-toolbar-applet %{_libdir}/bonobo/servers/* %endif +%endif %files qt4 -f uim-chardict-qt.lang %defattr(-, root, root) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
