rpms/glib-java/devel glib-java.spec,1.49,1.50

[fedora-cvs-commits at redhat.com]

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11302

Modified Files:
	glib-java.spec 
Log Message:
- Force -fPIC and avoid -Wall with gcj/ecj.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- glib-java.spec	27 Feb 2007 18:50:15 -0000	1.49
+++ glib-java.spec	2 Mar 2007 14:20:09 -0000	1.50
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.6
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 Patch0:    %{name}-gjavah.patch
@@ -57,11 +57,11 @@
 	export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig
 fi
 
-%configure 
-
-# FIXME: find a better solution for this
-sed -i 's/^pic_flag=\"\"/pic_flag=\"\ \-fPIC\"/' libtool
-sed -i 's/^compiler_c_o=\"no\"/compiler_c_o=\"yes\"/' libtool
+# Two workarounds:
+# 1) libtool.m4 calls gcj with $CFLAGS and gcj seems to choke on -Wall.
+# 2) libtool does not use pic_flag when compiling, so we have to force it.
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wall /}
+%configure CFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="-O2 -fPIC"
 
 make %{?_smp_mflags}
 
@@ -119,6 +119,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Mar  2 2007 Stepan Kasal <skasal at redhat.com> - 0.2.6-7
+- Force -fPIC and avoid -Wall with gcj/ecj.
+
 * Tue Feb 27 2007 Stepan Kasal <skasal at redhat.com> - 0.2.6-6
 - The gjavah patch should change configure.ac first, then configure.