rpms/tomoe-gtk/F-11 tomoe-gtk-0.6.0-cflags.patch, NONE, 1.1 import.log, 1.3, 1.4 tomoe-gtk.spec, 1.7, 1.8

[Ding-Yi Chen]

Author: dchen

Update of /cvs/pkgs/rpms/tomoe-gtk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28401/F-11

Modified Files:
	import.log tomoe-gtk.spec 
Added Files:
	tomoe-gtk-0.6.0-cflags.patch 
Log Message:
Add patch src/Makefile.am to fix RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS

tomoe-gtk-0.6.0-cflags.patch:
 bindings/python/Makefile.am |    1 +
 src/Makefile.am             |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE tomoe-gtk-0.6.0-cflags.patch ---
diff -up ./bindings/python/Makefile.am.cflags ./bindings/python/Makefile.am
--- ./bindings/python/Makefile.am.cflags	2009-07-29 15:20:50.000000000 +1000
+++ ./bindings/python/Makefile.am	2009-07-29 15:21:05.000000000 +1000
@@ -8,6 +8,7 @@ INCLUDES =			\
 	$(PYGTK_CFLAGS)		\
 	$(GTK2_CFLAGS)		\
 	$(TOMOE_CFLAGS)		\
+	$(RPM_CFLAGS)		\
 	-I$(top_srcdir)/src	\
 	-I$(top_builddir)/src
 
diff -up ./src/Makefile.am.cflags ./src/Makefile.am
--- ./src/Makefile.am.cflags	2007-06-11 13:56:00.000000000 +1000
+++ ./src/Makefile.am	2009-07-29 15:22:22.000000000 +1000
@@ -1,7 +1,8 @@
 AM_CPPFLAGS =								\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"				\
 	-DDATADIR=\""$(datadir)"\"					\
-	-DTOMOEGTKDATADIR=\""$(datadir)"/$(PACKAGE)\"
+	-DTOMOEGTKDATADIR=\""$(datadir)"/$(PACKAGE)\"			\
+	$(RPM_CFLAGS)
 
 INCLUDES = $(GTK2_CFLAGS) $(TOMOE_CFLAGS) $(GUCHARMAP_CFLAGS)
 LIBS     = $(GTK2_LIBS)   $(TOMOE_LIBS)   $(GUCHARMAP_LIBS)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe-gtk/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	16 Jul 2009 02:19:00 -0000	1.3
+++ import.log	10 Aug 2009 00:31:55 -0000	1.4
@@ -1,3 +1,4 @@
 tomoe-gtk-0_6_0-7_fc11:F-11:tomoe-gtk-0.6.0-7.fc11.src.rpm:1242200869
 tomoe-gtk-0_6_0-8_fc11:F-11:tomoe-gtk-0.6.0-8.fc11.src.rpm:1247443864
 tomoe-gtk-0_6_0-9_fc11:F-11:tomoe-gtk-0.6.0-9.fc11.src.rpm:1247710729
+tomoe-gtk-0_6_0-11_fc11:F-11:tomoe-gtk-0.6.0-11.fc11.src.rpm:1249864298


Index: tomoe-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe-gtk/F-11/tomoe-gtk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tomoe-gtk.spec	16 Jul 2009 02:19:00 -0000	1.7
+++ tomoe-gtk.spec	10 Aug 2009 00:31:55 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           tomoe-gtk
 Version:        %{tomoe_ver}
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Gtk library for tomoe for Japanese and Chinese handwritten input
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ License:        LGPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.6.0-rpath.patch
+Patch1:         %{name}-0.6.0-cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       tomoe >= %{tomoe_ver}
@@ -49,7 +50,7 @@ Install this if you want to develop prog
 %prep
 %setup -q
 %patch0 -p0 -b .rpath
-
+%patch1 -p0 -b .cflags
 
 %build
 autoreconf -iv
@@ -61,7 +62,9 @@ make %{?_smp_mflags} RPM_CFLAGS="$RPM_OP
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/tomoegtk.a
 rm $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/tomoegtk.la
 
 %find_lang %{name}
@@ -99,6 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/tomoegtk.so
 
 %changelog
+* Wed Jul 29 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-11
+- Add patch src/Makefile.am to fix RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
 - Add back autoconf, automake to fix RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS