- fix building with gnome-panel 3.16

- rel 3

diff --git a/gnome-panel-3.16.patch b/gnome-panel-3.16.patch
new file mode 100644 (file)
index 0000000..53f63b8
--- /dev/null
+++ b/gnome-panel-3.16.patch
@@ -0,0 +1,39 @@
+--- uim-1.8.6/configure.ac~    2013-06-30 06:26:20.000000000 +0200
++++ uim-1.8.6/configure.ac     2015-04-12 14:21:41.827256716 +0200
+@@ -898,12 +898,12 @@
+         use_applet_gnome3="no"
+       ;;
+       yes|*)
+-        PKG_CHECK_MODULES(APPLET_GNOME3, libpanelapplet-4.0, use_applet_gnome3="yes",use_applet_gnome3="no")
++        PKG_CHECK_MODULES(APPLET_GNOME3, libpanel-applet, use_applet_gnome3="yes",use_applet_gnome3="no")
+       ;;
+     esac
+   ],
+   [
+-    PKG_CHECK_MODULES(APPLET_GNOME3, libpanelapplet-4.0, use_applet_gnome3="yes",use_applet_gnome3="no")
++    PKG_CHECK_MODULES(APPLET_GNOME3, libpanel-applet, use_applet_gnome3="yes",use_applet_gnome3="no")
+   ])
+ 
+ dnl ****************************
+--- uim-1.8.6/gtk3/toolbar/applet-gnome3.c~    2013-06-30 06:26:09.000000000 +0200
++++ uim-1.8.6/gtk3/toolbar/applet-gnome3.c     2015-04-12 14:36:02.283917154 +0200
+@@ -168,7 +168,7 @@
+   gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE);
+   gtk_action_group_add_actions(action_group, uim_menu_actions,
+       G_N_ELEMENTS(uim_menu_actions), toolbar);
+-  panel_applet_setup_menu(applet, uim_menu_xml, action_group);
++  panel_applet_setup_menu(applet, uim_menu_xml, action_group, "uim");
+ #if LIBPANEL_APPLET_HAVE_SET_BACKGROUND_WIDGET
+   panel_applet_set_background_widget(applet, GTK_WIDGET(applet));
+ #endif
+--- uim-1.8.6/gtk3/toolbar/Makefile.am~        2013-06-30 06:26:09.000000000 +0200
++++ uim-1.8.6/gtk3/toolbar/Makefile.am 2015-04-12 14:50:19.527244281 +0200
+@@ -18,7 +18,7 @@
+ uim_toolbar_applet_gnome3_SOURCES = applet-gnome3.c \
+                              ../../gtk2/toolbar/common-gtk.c
+ 
+-appletdir = $(datadir)/gnome-panel/4.0/applets
++appletdir = $(datadir)/gnome-panel/5.0/applets
+ applet_DATA = UimApplet.panel-applet
+ applet_in_files = $(applet_DATA:=.in)
+ applet_in_in_files = $(applet_in_files:=.in)

diff --git a/uim.spec b/uim.spec
index 5c705b4aa545e5816d3c36debb81cff50c2cfa0b..78831640de59ab496edad5255681f56358195b64 100644 (file)
--- a/uim.spec
+++ b/uim.spec
@@ -16,7 +16,7 @@ Summary:      Multilingual input method library
 Summary(pl.UTF-8):     Biblioteka obsługująca wejście w wielu językach
 Name:          uim
 Version:       1.8.6
-Release:       2
+Release:       3
 License:       GPL or BSD
 Group:         Libraries
 #Source0Download: http://code.google.com/p/uim/downloads/list
@@ -25,6 +25,7 @@ Source0:      http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:       %{name}.xinputd
 Source2:       %{name}-init.el
 Patch0:                %{name}-emacs-utf8.patch
+Patch1:                gnome-panel-3.16.patch
 URL:           http://uim.freedesktop.org/
 %{?with_canna:BuildRequires:   Canna-devel}
 %{?with_wnn:BuildRequires:     FreeWnn-devel}
@@ -419,6 +420,7 @@ japońskich.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 cp -a fep/README fep/README.fep
 cp -a fep/README.ja fep/README.fep.ja
@@ -426,6 +428,13 @@ cp -a fep/README.key fep/README.fep.key
 cp -a xim/README xim/README.xim
 
 %build
+%{__gettextize}
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        MANA=/usr/bin/mana \
        --enable-default-toolkit=gtk3 \
@@ -733,7 +742,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/uim-toolbar-applet-gnome3
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.UimAppletFactory.service
-%{_datadir}/gnome-panel/4.0/applets/UimApplet.panel-applet
+%{_datadir}/gnome-panel/5.0/applets/UimApplet.panel-applet
 %endif
 
 %if %{with qt3}