--- a/ChangeLog	Tue Sep 01 11:21:58 2009 +0000
+++ b/ChangeLog	Tue Sep 01 12:30:35 2009 +0000
@@ -1,4 +1,15 @@
+2009-09-01  Laszlo (Laca) Peter  <[email protected]>
+
+	* SUNWPython.spec: update 64-bit CFLAGS
+	* SUNWPython26.spec: update 64-bit CFLAGS; add sanity check to
+	  end of %install
+	* patches/Python-01-solaris-lib-dirs.diff: update to find 64-bit
+	  ncurses
+	* patches/Python26-01-solaris-lib-dirs.diff: update to find 64-bit
+	  ncurses
+
 2009-09-01  Ke Wang <[email protected]>
+
 	* base-specs/gst-plugins-good.spec: Add patch 13
 
 2009-09-01  Dave Lin <[email protected]>

--- a/SUNWPython.spec	Tue Sep 01 11:21:58 2009 +0000
+++ b/SUNWPython.spec	Tue Sep 01 12:30:35 2009 +0000
@@ -172,7 +172,7 @@
 cd Python-%{version}-64
 
 export CXXFLAGS="%cxx_optflags64"
-export CFLAGS="%optflags64"
+export CFLAGS="-I/usr/include/ncurses %optflags64"
 export CC="$CC %optflags64"
 export CXX="$CXX %cxx_optflags64"
 export DFLAGS=-64

--- a/SUNWPython26.spec	Tue Sep 01 11:21:58 2009 +0000
+++ b/SUNWPython26.spec	Tue Sep 01 12:30:35 2009 +0000
@@ -186,9 +186,8 @@
 cd Python-%{version}-64
 
 export CXXFLAGS="%cxx_optflags64"
-export CFLAGS="%optflags64 -D_LARGEFILE64_SOURCE `PKG_CONFIG_PATH=%{_libdir}/_arch64 pkg-config --cflags libffi`"
-export CPPFLAGS="-D_LARGEFILE64_SOURCE `PKG_CONFIG_PATH=%{_libdir}/_arch64 pkg-config --cflags libffi`"
-export CFLAGS="%optflags64"
+export CFLAGS="-I/usr/include/ncurses  %optflags64 -D_LARGEFILE64_SOURCE `PKG_CONFIG_PATH=%{_libdir}/_arch64 pkg-config --cflags libffi`"
+export CPPFLAGS="-I/usr/include/ncurses -D_LARGEFILE64_SOURCE `PKG_CONFIG_PATH=%{_libdir}/_arch64 pkg-config --cflags libffi`"
 export CC="$CC %optflags64"
 export CXX="$CXX %cxx_optflags64"
 export DFLAGS=-64
@@ -301,6 +300,20 @@
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
+# sanity check: verify that some tricky modules were successfully built:
+for f in _ctypes.so _curses.so _curses_panel.so _elementtree.so \
+    _multiprocessing.so _sqlite3.so _ssl.so _tkinter.so crypt.so \
+    pyexpat.so sunaudiodev.so zlib.so dlpi.so ucred.so bz2.so\
+    64/_ctypes.so 64/_curses.so 64/_curses_panel.so 64/_elementtree.so \
+    64/_multiprocessing.so 64/_sqlite3.so 64/_ssl.so 64/_tkinter.so \
+    64/crypt.so 64/dlpi.so 64/ucred.so 64/pyexpat.so 64/bz2.so 64/zlib.so \
+    64/sunaudiodev.so; do
+    test -f $RPM_BUILD_ROOT%{_libdir}/python%{majmin}/lib-dynload/$f || {
+	echo ERROR: required module $f missing
+	exit 1
+    }
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 

--- a/patches/Python-01-solaris-lib-dirs.diff	Tue Sep 01 11:21:58 2009 +0000
+++ b/patches/Python-01-solaris-lib-dirs.diff	Tue Sep 01 12:30:35 2009 +0000
@@ -72,7 +72,7 @@
                                     libraries = ['ssl', 'crypto'],
                                     depends = ['socketmodule.h']), )
  
-@@ -727,6 +746,12 @@
+@@ -727,6 +746,14 @@
  
          # Curses support, requiring the System V version of curses, often
          # provided by the ncurses library.
@@ -82,6 +82,8 @@
 +            # look for ncurses in /usr/gnu on Solaris
 +            curses_inc_dirs.append('/usr/include/ncurses')
 +            curses_lib_dirs.append('/usr/gnu/lib')
++            curses_lib_dirs.append('/usr/gnu/lib/amd64')
++            curses_lib_dirs.append('/usr/gnu/lib/sparcv9')
          panel_library = 'panel'
          if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
              curses_libs = ['ncursesw']

--- a/patches/Python26-01-solaris-lib-dirs.diff	Tue Sep 01 11:21:58 2009 +0000
+++ b/patches/Python26-01-solaris-lib-dirs.diff	Tue Sep 01 12:30:35 2009 +0000
@@ -62,7 +62,7 @@
                                     libraries = ['ssl', 'crypto'],
                                     depends = ['socketmodule.h']), )
          else:
-@@ -1079,6 +1095,12 @@
+@@ -1079,6 +1095,14 @@
  
          # Curses support, requiring the System V version of curses, often
          # provided by the ncurses library.
@@ -72,6 +72,8 @@
 +            # look for ncurses in /usr/gnu on Solaris
 +            curses_inc_dirs.append('/usr/include/ncurses')
 +            curses_lib_dirs.append('/usr/gnu/lib')
++            curses_lib_dirs.append('/usr/gnu/lib/amd64')
++            curses_lib_dirs.append('/usr/gnu/lib/sparcv9')
          panel_library = 'panel'
          if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
              curses_libs = ['ncursesw']