rpms/uim/devel uim-1.5.5-applet.patch,NONE,1.1 uim.spec,1.70,1.71

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22451

Modified Files:
	uim.spec 
Added Files:
	uim-1.5.5-applet.patch 
Log Message:
* Thu Feb 26 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.5-1
- New upstream release.

uim-1.5.5-applet.patch:

--- NEW FILE uim-1.5.5-applet.patch ---
diff -pruN uim-1.5.5.orig/configure.ac uim-1.5.5/configure.ac
--- uim-1.5.5.orig/configure.ac	2008-10-29 20:15:24.000000000 +0900
+++ uim-1.5.5/configure.ac	2009-02-26 18:57:03.000000000 +0900
@@ -725,13 +725,13 @@ AC_ARG_ENABLE(gnome-applet,
         use_applet_gnome="no"
       ;;
       yes|*)
-        PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0, use_applet_gnome="yes",use_applet_gnome="no")
+        PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0 libgnomeui-2.0, use_applet_gnome="yes",use_applet_gnome="no")
         PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0, panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
       ;;
     esac
   ],
   [
-    PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0, use_applet_gnome="yes",use_applet_gnome="no")
+    PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0 libgnomeui-2.0, use_applet_gnome="yes",use_applet_gnome="no")
     PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0, panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
   ])
 


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- uim.spec	25 Feb 2009 22:41:44 -0000	1.70
+++ uim.spec	26 Feb 2009 11:00:21 -0000	1.71
@@ -2,8 +2,8 @@
 %define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.5.3
-Release:	2%{?dist}
+Version:	1.5.5
+Release:	1%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -12,7 +12,7 @@
 URL:		http://code.google.com/p/uim/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
-BuildRequires:	gtk2-devel gnome-panel-devel qt3-devel qt-devel ncurses-devel
+BuildRequires:	gtk2-devel gnome-panel-devel qt3-devel qt-devel ncurses-devel libgnomeui-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel eb-devel gettext desktop-file-utils
 BuildRequires:	m17n-db-amharic m17n-db-arabic m17n-db-armenian m17n-db-assamese m17n-db-bengali
 BuildRequires:	m17n-db-chinese m17n-db-croatian m17n-db-dhivehi m17n-db-farsi m17n-db-generic
@@ -28,6 +28,7 @@
 Source2:	uim-init.el
 Patch0:		uim-1.4.2-emacs23.patch
 Patch1:		uim-qt-destdir.patch
+Patch2:		uim-1.5.5-applet.patch
 
 
 Summary:	A multilingual input method library
@@ -214,6 +215,8 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .emacs23
 %patch1 -p1 -b .qt-destdir
+%patch2 -p1 -b .applet
+libtoolize -f
 aclocal -Im4
 automake --add-missing
 autoconf
@@ -232,12 +235,15 @@
 	--with-qt --with-qt-immodule --with-qt4-immodule \
 	--with-lispdir=%{_datadir}/emacs/site-lisp \
 	--enable-pref
-make
+
+#sed -i -e 's/^\(hardcode_direct=\)$/\1yes/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' -e 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool
+sed -i -e 's/^\(hardcode_direct=\)$/\1no/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' libtool
+LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs make install DESTDIR=$RPM_BUILD_ROOT
 # For XEmacs
 (cd emacs; make install DESTDIR=$RPM_BUILD_ROOT UIMEL_LISP_DIR=%{_datadir}/xemacs/site-packages/lisp/uim-el)
 
@@ -511,6 +517,9 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Thu Feb 26 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.5-1
+- New upstream release.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild