2012-05-30 Ghee Teo <ghee.teo@oracle.com>

        RTI#363433 fixes
        7172260 SUNWlibgsf.spec does not build with new tool chain in s11 u1
        * base-specs/libgsf.spec:
        * patches/libgsf-02-python-lib.diff:
        * specs/SUNWlibgsf.spec:



git-svn-id: svn+ssh://svn.opensolaris.org/svn/jds/spec-files/branches/gnome-2-30-s11update@24467 658918a1-3e11-0410-9343-a0df99e799fd

ChangeLog

@@ -1,3 +1,11 @@
+2012-05-30  Ghee Teo  <ghee.teo@oracle.com>
+
+	RTI#363433 fixes
+	7172260 SUNWlibgsf.spec does not build with new tool chain in s11 u1
+	* base-specs/libgsf.spec:
+	* patches/libgsf-02-python-lib.diff:
+	* specs/SUNWlibgsf.spec:
+
 2012-05-29  Ghee Teo  <ghee.teo@oracle.com>
 
 	RTI#363128 fixes

base-specs/libgsf.spec

@@ -1,7 +1,8 @@
 #
 # spec file for package libgsf
 #
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+#
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -24,6 +25,8 @@ Source1:                 l10n-configure.sh
 %endif
 # date:2004-04-12 owner:hawklu type:feature
 Patch0:			libgsf-01-uninstalled-pc.diff
+# date:2012-05-28 owner:gheet type:bug bugster:7172260
+Patch1:			libgsf-02-python-lib.diff
 URL:			http://ftp.gnome.org/pub/gnome/sources/libgsf/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
@@ -91,6 +94,7 @@ libgsf development headers
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 #####################################
 ##      Package Build Section      ##
@@ -120,14 +124,15 @@ aclocal $ACLOCAL_FLAGS  -I ./m4
 autoheader
 automake -a -c -f
 autoconf
+cp /usr/share/gettext/config.rpath .
 
 ./configure --prefix=%{_prefix}            \
       --bindir=%{_bindir}                  \
       --libdir=%{_libdir}                  \
       --includedir=%{_includedir}          \
       --sysconfdir=%{_sysconfdir}          \
       --mandir=%{_mandir}                  \
-      --with-gnome                         \
+      --with-python                         \
       --with-bz2                           \
       --with-gnome-vfs                     \
       --with-gio                           
@@ -188,6 +193,8 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gsf-office-th
 %{_datadir}/gtk-doc/html/libgsf/*
 
 %changelog
+* Mon May 28 2012 - ghee.teo@oracle.com
+- added patch libgsf-02-python-lib.diff
 * Wed Oct 27 2010 - brian.cameron@oracle.com
 - Bump to 1.14.19.
 * Mon Apr 12 2010 - christian.kelly@oracle.com

patches/libgsf-02-python-lib.diff

@@ -0,0 +1,41 @@
+diff -urN libgsf-1.14.19/configure.in ../../SUNWlibgsf-1.14.19.hacked/amd64/libgsf-1.14.19/configure.in
+--- libgsf-1.14.19/configure.in	2010-04-08 01:59:27.000000000 +0100
++++ ../../SUNWlibgsf-1.14.19.hacked/amd64/libgsf-1.14.19/configure.in	2012-05-28 15:49:41.660842333 +0100
+@@ -291,6 +291,7 @@
+ if test "x$test_python" = xtrue ; then
+     pygobject_msg=test
+     AM_PATH_PYTHON
++    PYTHON_LIB="-lpython2.6"
+
+     AM_CHECK_PYTHON_HEADERS(,[pygobject_msg="NO.  Missing python headers"])
+
+@@ -316,6 +317,8 @@
+     pygobject_msg=no
+ fi
+
++AC_SUBST(PYTHON_LIB)
++
+ AM_CONDITIONAL(WITH_PYTHON, [test "$pygobject_msg" = yes])
+
+ dnl ***********************************************************************************
+diff -urN libgsf-1.14.19/python/Makefile.am ../../SUNWlibgsf-1.14.19.hacked/amd64/libgsf-1.14.19/python/Makefile.am
+--- libgsf-1.14.19/python/Makefile.am	2009-05-19 02:55:48.000000000 +0100
++++ ../../SUNWlibgsf-1.14.19.hacked/amd64/libgsf-1.14.19/python/Makefile.am	2012-05-28 15:50:36.533748264 +0100
+@@ -22,7 +22,7 @@
+ gnomemodule_la_LIBADD = \
+ 	$(top_builddir)/gsf-gnome/libgsf-gnome-1.la	\
+ 	$(top_builddir)/gsf/libgsf-1.la			\
+-	$(LIBGSF_LIBS) $(LIBGSF_GNOME_LIBS)
++	$(LIBGSF_LIBS) $(PYTHON_LIB) $(LIBGSF_GNOME_LIBS)
+ gnomemodule_la_SOURCES = gsfgnomemodule.c
+ nodist_gnomemodule_la_SOURCES = gsfgnome.c
+ CLEANFILES += gsfgnome.c
+@@ -33,7 +33,7 @@
+ 	-I$(top_srcdir)		\
+ 	$(LIBGSF_CFLAGS)
+ _gsfmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gsf
+-_gsfmodule_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
++_gsfmodule_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) $(PYTHON_LIB)
+ _gsfmodule_la_SOURCES = gsfmodule.c
+ nodist__gsfmodule_la_SOURCES = gsf.c
+ CLEANFILES += gsf.c

specs/SUNWlibgsf.spec

@@ -83,13 +83,7 @@ gzcat %SOURCE0 | tar xf -
 export PYTHON="/usr/bin/python%{default_python_version}"
 
 %ifarch amd64 sparcv9
-if [ "x`basename $CC`" != xgcc ]
-then
-  FLAG64="-xarch=generic64"
-else
-  FLAG64="-m64"
-fi
-
+FLAG64="-m64"
 export LDFLAGS="$FLAG64"
 export CFLAGS="%optflags64"
 export RPM_OPT_FLAGS="$CFLAGS"