--- a/ChangeLog	Thu Nov 04 20:18:46 2010 +0000
+++ b/ChangeLog	Thu Nov 04 20:31:01 2010 +0000
@@ -1,3 +1,8 @@
+2010-11-04  Alex Viskovatoff <[email protected]>
+
+	* SFEqt4.spec:  Add %include osdistro.inc
+	* SFEyasm.spec: Update to 1.1.0
+
 2010-11-04 Milan Jurik <[email protected]>
 
 	* SFEscons.spec: bump to 2.0.1

--- a/SFEqt4.spec	Thu Nov 04 20:18:46 2010 +0000
+++ b/SFEqt4.spec	Thu Nov 04 20:31:01 2010 +0000
@@ -12,6 +12,7 @@
 # spec's use of the -library=stdcxx4 option.
 
 %include Solaris.inc
+%include osdistro.inc
 %define srcname qt-x11-opensource-src
 
 Name:                SFEqt4
@@ -45,6 +46,7 @@
 %prep
 %setup -q -n %{srcname}-%version
 
+##TODO##  Verify that build 147 really is the correct build number for this change
 %if %( expr %{osbuild} '>=' 147 )
 # In libpng-1.4, the "trans" and "trans_values" fields have been renamed to
 # "trans_alpha" and "trans_color", respectively.
@@ -121,6 +123,8 @@
 %{_datadir}/doc/*
 
 %changelog
+* Nov  4 2010 - Alex Viskovatoff
+- Spec needs "%include osdistro.inc" (pointed out by Thomas Wagner)
 * Nov  3 2010 - Alex Viskovatoff
 - Add patch by Milan Jurik to use new libpng names only for osbuild >= 147
 - Use cxx_optflags

--- a/SFEyasm.spec	Thu Nov 04 20:18:46 2010 +0000
+++ b/SFEyasm.spec	Thu Nov 04 20:31:01 2010 +0000
@@ -10,7 +10,7 @@
 
 Name:                   SFEyasm
 Summary:                Yet another assembler
-Version:                0.8.0
+Version:                1.1.0
 Source:                 %{src_url}/%{src_name}-%{version}.tar.gz
 Patch1:                 yasm-01-bin_multi_test.sh.diff
 Patch2:                 yasm-02-configure.diff

--- a/patches/yasm-01-bin_multi_test.sh.diff	Thu Nov 04 20:18:46 2010 +0000
+++ b/patches/yasm-01-bin_multi_test.sh.diff	Thu Nov 04 20:31:01 2010 +0000
@@ -1,8 +1,8 @@
---- yasm-0.7.1.orig/modules/objfmts/bin/tests/multisect/bin_multi_test.sh	2008-05-14 21:34:59.000000000 -0400
-+++ yasm-0.7.1/modules/objfmts/bin/tests/multisect/bin_multi_test.sh	2008-06-27 14:13:43.721320000 -0400
+--- yasm-1.1.0/modules/objfmts/bin/tests/bin_test.sh.orig	Sat Aug  7 12:34:33 2010
++++ yasm-1.1.0/modules/objfmts/bin/tests/bin_test.sh	Thu Nov  4 15:45:26 2010
 @@ -1,4 +1,4 @@
 -#! /bin/sh
 +#! /bin/bash
- # $Id: bin_multi_test.sh 2010 2007-11-14 08:33:32Z peter $
- 
- YASM_TEST_SUITE=1
+ # $Id: bin_test.sh 1137 2004-09-04 01:24:57Z peter $
+ ${srcdir}/out_test.sh bin_test modules/objfmts/bin/tests "bin objfmt" "-f bin" ""
+ exit $?

--- a/patches/yasm-02-configure.diff	Thu Nov 04 20:18:46 2010 +0000
+++ b/patches/yasm-02-configure.diff	Thu Nov 04 20:31:01 2010 +0000
@@ -1,6 +1,6 @@
---- yasm-0.7.1.orig/configure	2008-05-14 21:40:34.000000000 -0400
-+++ yasm-0.7.1/configure	2008-06-27 14:25:12.095991000 -0400
-@@ -10448,12 +10448,6 @@
+--- yasm-1.1.0/configure.orig	Sat Aug  7 12:38:19 2010
++++ yasm-1.1.0/configure	Thu Nov  4 16:02:23 2010
+@@ -7676,12 +7676,6 @@
  # Add some more CFLAGS for various options.
  #
  

--- a/patches/yasm-03-out_test.sh.diff	Thu Nov 04 20:18:46 2010 +0000
+++ b/patches/yasm-03-out_test.sh.diff	Thu Nov 04 20:31:01 2010 +0000
@@ -1,8 +1,8 @@
---- yasm-0.7.1.orig/out_test.sh	2008-05-14 21:35:11.000000000 -0400
-+++ yasm-0.7.1/out_test.sh	2008-06-27 14:12:12.624246000 -0400
+--- yasm-1.1.0/out_test.sh.orig	Thu Nov  4 15:53:39 2010
++++ yasm-1.1.0/out_test.sh	Thu Nov  4 15:55:40 2010
 @@ -1,4 +1,4 @@
 -#! /bin/sh
-+#!/bin/bash
- # $Id: out_test.sh 1825 2007-04-22 03:32:46Z peter $
++#! /bin/bash
+ # $Id: out_test.sh 2226 2009-07-30 02:19:38Z peter $
  
  YASM_TEST_SUITE=1