rpms/kinput2/devel kinput2.spec,1.11,1.12

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28824

Modified Files:
	kinput2.spec 
Log Message:
* Tue Feb 13 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-31
- Build with RPM_OPT_FLAGS. (#227752)


Index: kinput2.spec
===================================================================
RCS file: /cvs/extras/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kinput2.spec	26 Jan 2007 12:01:45 -0000	1.11
+++ kinput2.spec	13 Feb 2007 05:05:52 -0000	1.12
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 30%{?dist}
+Release: 31%{?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
@@ -92,9 +92,16 @@
 head -21 cmd/kinput2.c >Copyright
 
 %build
+
+fixoptflags() {
+	find . -name Makefile \
+	| xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/'
+}
+
 %if %{build_with_wnn4}
 ln -sf Kinput2.conf.wnn4 Kinput2.conf
 xmkmf -a
+fixoptflags
 make %{?_smp_mflags}
 mv cmd/kinput2 kinput2.wnn4
 make clean
@@ -103,6 +110,7 @@
 %if %{build_with_wnn6}
 ln -sf Kinput2.conf.wnn6 Kinput2.conf
 xmkmf -a
+fixoptflags
 make %{?_smp_mflags}
 mv cmd/kinput2 kinput2.wnn6
 make clean
@@ -112,6 +120,7 @@
 rm -f Kinput2.conf
 ln -sf Kinput2.conf.canna Kinput2.conf
 xmkmf -a
+fixoptflags
 make %{?_smp_mflags}
 mv cmd/kinput2 kinput2.canna
 make clean
@@ -120,6 +129,7 @@
 %if %{build_with_canna_wnn4}
 ln -sf Kinput2.conf.canna-wnn4 Kinput2.conf
 xmkmf -a
+fixoptflags
 make %{?_smp_mflags}
 mv cmd/kinput2 kinput2.canna-wnn4
 make clean
@@ -128,6 +138,7 @@
 %if %{build_with_canna_wnn6}
 ln -sf Kinput2.conf.canna-wnn6 Kinput2.conf
 xmkmf -a
+fixoptflags
 make %{?_smp_mflags}
 mv cmd/kinput2 kinput2.canna-wnn6
 %endif
@@ -242,6 +253,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Tue Feb 13 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-31
+- Build with RPM_OPT_FLAGS. (#227752)
+
 * 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.