rpms/kinput2/FC-6 kinput2.spec,1.7,1.8

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/kinput2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14925

Modified Files:
	kinput2.spec 
Log Message:
* Fri Jan 26 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-30
- Backport a patch to update the status with XmbResetIC() properly.
- Disable Wnn support so that no *Wnn* devel package available anymore.
- Install ccdef files under /usr/lib on even 64bit archs according to the path
  imake generates. (#209622)


Index: kinput2.spec
===================================================================
RCS file: /cvs/extras/rpms/kinput2/FC-6/kinput2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kinput2.spec	11 Sep 2006 03:11:22 -0000	1.7
+++ kinput2.spec	26 Jan 2007 11:55:11 -0000	1.8
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: Distributable
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -59,7 +59,7 @@
 Patch7: kinput2-v3.1-fix-gcc-warning.patch
 Patch8: kinput2-v3.1-activate_im_with_kanji.patch
 Patch9: kinput2-v3.1-jp106_xfer.patch
-Patch10: kinput2-redraw.patch
+Patch10: kinput2-v3.1-status-update-204892.patch
 
 Summary: kinput2 - kanji input server for X11
 Group: User Interface/X
@@ -153,9 +153,11 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
 
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/ccdef
-install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT%{_libdir}/X11/ccdef
-install -c -m 0444 ccdef/rule.*  $RPM_BUILD_ROOT%{_libdir}/X11/ccdef
+%if %{is_wnn_used}
+mkdir -p $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -c -m 0444 ccdef/rule.*  $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+%endif
 
 make install.man DESTDIR=$RPM_BUILD_ROOT
 
@@ -231,13 +233,19 @@
 %doc Copyright NEWS README doc
 %config %{_datadir}/X11/app-defaults/Kinput2
 %if %{is_wnn_used}
-%{_libdir}/X11/ccdef
+/usr/lib/X11/ccdef
 %endif
 %{_bindir}/kinput2*
 %{_mandir}/man1/kinput2.1x*
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Fri Jan 26 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-30
+- Backport a patch to update the status with XmbResetIC() properly.
+- Disable Wnn support so that no *Wnn* devel package available anymore.
+- Install ccdef files under /usr/lib on even 64bit archs according to the path
+  imake generates. (#209622)
+
 * Mon Sep 11 2006 Akira TAGOH <tagoh at redhat.com> - v3.1-29
 - rebuilt