--- a/ChangeLog	Fri Oct 13 20:44:28 2006 +0000
+++ b/ChangeLog	Sun Oct 15 03:39:06 2006 +0000
@@ -1,3 +1,24 @@
+2006-10-14  Laszlo (Laca) Peter  <[email protected]>
+
+	* SFEaxyftp.spec: disable parallel build
+	* SFEf-spot.spec: bump to 0.2.2; delete upstream patch solaris.diff
+	* SFElibao.spec: add aclocal dir to %files
+	* SFEmercurial.spec: delete, now part of Solaris Nevada
+	* SFEmono.spec: bump to 1.1.18
+	* SFEneon.spec: (new) neon http and webdav library (used to
+	  be included in the subversion pkg)
+	* SFEsourcenav.spec: move to /usr/sourcenav -- moving just datadir
+	  doesn't work unfortunately; get rid of devel subpkg
+	* SFEsubversion.spec: disable parallel build as it breaks on
+	  multicpu systems bump to 1.4.0
+	* SFEwxwidgets.spec: fix wx-config to be a relative symlink
+	* SUNWgnome-project.spec: fix /usr/share/gnome attributes in l10n
+	  subpkg
+	* patches/f-spot-01-solaris.diff: delete, upstream
+	* patches/mono-01-solaris.diff: merge for 1.1.18
+	* patches/subversion-01-libneon.la.diff: don't try to link to
+	  libneon.la cause we're not shipping it
+
 2006-10-13  Laszlo (Laca) Peter  <[email protected]>
 
 	* SFEapsfilter.spec: fix %{_datadir} permissions

--- a/SFEaxyftp.spec	Fri Oct 13 20:44:28 2006 +0000
+++ b/SFEaxyftp.spec	Sun Oct 15 03:39:06 2006 +0000
@@ -23,20 +23,13 @@
 %setup -q -n axyftp-%version
 
 %build
-
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-     CPUS=1
-fi
-
-
 export CFLAGS="%optflags"
 export LDFLAGS="%{_ldflags} -R/usr/dt/lib"
 
 ./configure --prefix=%{_prefix}  \
             --mandir=%{_mandir} \
 
-make -j$CPUS
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +49,7 @@
 %{_datadir}/*
 
 %changelog
-* 
+* Sat Oct 14 2006 - [email protected]
+- disable parallel build as it breaks on multicpu systems
 * Mon Sep 25 2006 - Eric Boutilier
 - Initial spec

--- a/SFEf-spot.spec	Fri Oct 13 20:44:28 2006 +0000
+++ b/SFEf-spot.spec	Sun Oct 15 03:39:06 2006 +0000
@@ -6,10 +6,9 @@
 %include Solaris.inc
 
 Name:         SFEf-spot
-Version:      0.2.0
+Version:      0.2.2
 Summary:      f-spot - personal photo management application for the GNOME Desktop
-Source:       http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.2/f-spot-%{version}.tar.bz2
-Patch1:       f-spot-01-solaris.diff
+Source:       http://ftp.gnome.org/pub/GNOME/sources/f-spot/0.2/f-spot-%{version}.tar.bz2
 URL:          http://f-spot.org/
 SUNW_BaseDir: %{_basedir}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -33,7 +32,6 @@
 %prep
 %setup -q -c -n %name-%version
 cd f-spot-%{version}
-%patch1 -p1 -b .prctl
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -95,6 +93,8 @@
 %endif
 
 %changelog
+* Sat Oct 14 2006 - [email protected]
+- bump to 0.2.2; delete upstream patch solaris.diff
 * Wed Oct 11 2006 - [email protected]
 - add lcms dependency
 * Wed Sep  7 2006 - [email protected]

--- a/SFElibao.spec	Fri Oct 13 20:44:28 2006 +0000
+++ b/SFElibao.spec	Sun Oct 15 03:39:06 2006 +0000
@@ -69,8 +69,12 @@
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/doc
 %{_datadir}/doc/*
+%dir %attr (0755, root, other) %{_datadir}/aclocal
+%{_datadir}/aclocal/*
 
 %changelog
+* Sat Oct 14 2006 - [email protected]
+- add aclocal dir to %files
 * Wed Oct 11 2006 - [email protected]
 - create -devel subpkg
 - fix some directory attributes

--- a/SFEmercurial.spec	Fri Oct 13 20:44:28 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#
-# spec file for package SFEmercurial
-#
-# includes module(s): mercurial
-#
-%include Solaris.inc
-
-%define python_version 2.4
-
-Name:			SFEmercurial
-License:		GPL
-Group:			system/dscm
-Version:		0.9
-Release:		1
-Summary:		Mercurial SCM
-Source:			http://www.selenic.com/mercurial/release/mercurial-%{version}.tar.gz
-URL:			http://www.selenic.com
-BuildRoot:		%{_tmppath}/%{name}-%{version}-build
-SUNW_BaseDir:		%{_prefix}
-%include default-depend.inc
-Requires: SUNWPython
-Requires: SUNWcsr
-
-%description
-Mercurial source code management system.
-
-%prep
-%setup -q -n mercurial-%{version}
-
-%build
-export PYTHON="/usr/bin/python"
-CFLAGS="$RPM_OPT_FLAGS"
-python setup.py build
-
-%install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
-mv $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages \
-   $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
-
-# Delete precompiled py code (*.pyc). May not be compatibile with dest system.
-find $RPM_BUILD_ROOT%{_prefix} -type f -name "*.pyc" -exec rm -f {} ';'
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%{_libdir}
-
-%changelog
-* Fri Jul  7 2006 - [email protected]
-- rename to SFEmercurial
-- update file attributes
-* Sun Jun  4 2006  <[email protected]>
-- bumped to v0.9
-- removed patch which is no longer needed
-- changed python perms to same as delevered in snv40
-* Sat Jan  7 2006  <[email protected]>
-- initial version

--- a/SFEmono.spec	Fri Oct 13 20:44:28 2006 +0000
+++ b/SFEmono.spec	Sun Oct 15 03:39:06 2006 +0000
@@ -9,7 +9,7 @@
 Name:         SFEmono
 License:      Other
 Group:        System/Libraries
-Version:      1.1.17.1
+Version:      1.1.18
 Summary:      mono - .NET framework
 Source:       http://go-mono.com/sources/mono/mono-%{version}.tar.gz
 URL:          http://www.mono-project.com/Main_Page
@@ -125,6 +125,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Oct 14 2006 - [email protected]
+- bump to 1.1.18
 * Wed Sep  7 2006 - [email protected]
 - bump to 1.1.17.1
 * Sat Jul 15 2006 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEneon.spec	Sun Oct 15 03:39:06 2006 +0000
@@ -0,0 +1,111 @@
+#
+# spec file for package SFEneon
+#
+# includes module(s): neon
+#
+%include Solaris.inc
+
+Name:			SFEneon
+License:		LGPL
+Group:			system/dscm
+Version:		0.25.5
+Release:		1
+Summary:		neon http and webdav client library
+Source:			http://www.webdav.org/neon/neon-%{version}.tar.gz
+URL:			http://www.webdav.org/neon/
+BuildRoot:		%{_tmppath}/%{name}-%{version}-build
+SUNW_BaseDir:		%{_prefix}
+%include default-depend.inc
+Requires: SUNWlibms
+Requires: SUNWzlib
+Requires: SUNWlexpt
+Requires: SUNWopenssl-libraries
+BuildRequires: SUNWopenssl-include
+BuildRequires: SUNWsfwhea
+
+%package devel
+Summary:                 %{summary} - development files
+SUNW_BaseDir:            %{_basedir}
+%include default-depend.inc
+Requires:                %{name}
+Requires:                SUNWbash
+
+%if %build_l10n
+%package l10n
+Summary:                 %{summary} - l10n files
+SUNW_BaseDir:            %{_basedir}
+%include default-depend.inc
+Requires:                %{name}
+%endif
+
+%prep
+%setup -q -n neon-%{version}
+
+%build
+export CFLAGS="%optflags -I/usr/sfw/include"
+export CPPFLAGS="-I/usr/sfw/include"
+export LD=/usr/ccs/bin/ld
+export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib -L$RPM_BUILD_ROOT%{_libdir}"
+export PATH=$PATH:/usr/apache2/bin
+./configure \
+    --prefix=%{_prefix} \
+    --exec-prefix=%{_prefix} \
+    --disable-static \
+    --enable-shared \
+    --mandir=%{_mandir} \
+    --with-ssl \
+    --infodir=%{_infodir}
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp
+
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_mandir}
+%dir %attr (0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/neon-config
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_mandir}
+%dir %attr (0755, root, bin) %{_mandir}/man3
+%{_mandir}/man3/*
+%dir %attr (0755, root, other) %{_datadir}/doc
+%{_datadir}/doc/*
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
+%changelog
+* Sat Oct 14 2006 - [email protected]
+- initial version

--- a/SFEsourcenav.spec	Fri Oct 13 20:44:28 2006 +0000
+++ b/SFEsourcenav.spec	Sun Oct 15 03:39:06 2006 +0000
@@ -15,12 +15,6 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 
-%package devel
-Summary:       %{summary} - development files
-SUNW_BaseDir:  %{_basedir}
-%include default-depend.inc
-Requires:      %name
-
 %prep
 %setup -q -n sourcenav-%{tarball_version}
 
@@ -31,11 +25,8 @@
 fi
 export CFLAGS="%optflags -DANSICPP"
 export LDFLAGS="%{_ldflags}"
-./configure --prefix=%{_prefix}			\
+./configure --prefix=%{_prefix}/sourcenav	\
 	    --mandir=%{_mandir}			\
-            --datadir=%{_datadir}/sourcenav     \
-	    --libdir=%{_libdir}			\
-	    --libexecdir=%{_libexecdir}		\
 	    --sysconfdir=%{_sysconfdir}
 	    
 make -j$CPUS 
@@ -44,11 +35,17 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-cd $RPM_BUILD_ROOT%{_prefix}
+cd $RPM_BUILD_ROOT%{_prefix}/sourcenav
 mv man/mann/* $RPM_BUILD_ROOT/%{_mandir}/mann/
 rm -rf man
 rm -rf COPYING INSTALL.TXT NEWS README.TXT html
 
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+cd $RPM_BUILD_ROOT/%{_bindir}
+echo 'mydir=`dirname $0`' > snavigator
+echo 'exec ${mydir}/../sourcenav/bin/snavigator "${@}"' >> snavigator
+chmod 755 snavigator
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,29 +53,16 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/*
-%dir %attr (0755, root, bin) %dir %{_libdir}
-%{_libdir}/*
+%{_prefix}/sourcenav
 %dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/sourcenav/bitmaps
-%{_datadir}/sourcenav/demos
-%{_datadir}/sourcenav/etc
-%{_datadir}/sourcenav/itc*
-%{_datadir}/sourcenav/itk*
-%{_datadir}/sourcenav/redhat
-%{_datadir}/sourcenav/sdk
-%{_datadir}/sourcenav/sourcenav
-%{_datadir}/sourcenav/tcl*
-%{_datadir}/sourcenav/tix*
-%{_datadir}/sourcenav/tk*
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*
 
-%files devel
-%dir %attr (0755, root, bin) %{_includedir}
-%{_includedir}/*
-
 %changelog
+* Sat Oct 14 2006 - [email protected]
+- move to /usr/sourcenav -- moving just datadir doesn't work unfortunately
+- get rid of devel subpkg
 * Sun Jul 23 2006 - [email protected]
 - rename to SFEsourcenav
 - mv datadir stuff into datadir/sourcenav subdir
@@ -86,4 +70,3 @@
 - define -devel subpkg
 * Mon Jul 17 2006 - Halton Huo <[email protected]>
 - Initial spec.
-

--- a/SFEsubversion.spec	Fri Oct 13 20:44:28 2006 +0000
+++ b/SFEsubversion.spec	Sun Oct 15 03:39:06 2006 +0000
@@ -8,10 +8,11 @@
 Name:			SFEsubversion
 License:		Apache,LGPL,BSD
 Group:			system/dscm
-Version:		1.3.2
+Version:		1.4.0
 Release:		1
 Summary:		Subversion SCM
 Source:			http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
+Patch1:                 subversion-01-libneon.la.diff
 URL:			http://subversion.tigris.org/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 SUNW_BaseDir:		%{_prefix}
@@ -23,8 +24,10 @@
 Requires: SUNWpostrun
 Requires: SUNWopenssl-libraries
 Requires: SUNWlexpt
+Requires: SFEneon
 BuildRequires: SUNWopenssl-include
 BuildRequires: SFEgdbm-devel
+BuildRequires: SFEneon-devel
 BuildConflicts: CBEsvn
 
 %description
@@ -47,16 +50,16 @@
 
 %prep
 %setup -q -n subversion-%{version}
+%patch1 -p1 -b .patch01
 
 %build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-  CPUS=1
-fi
 export CFLAGS="%optflags -I/usr/sfw/include"
 export CPPFLAGS="-I/usr/sfw/include"
 export LD=/usr/ccs/bin/ld
 export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib -L$RPM_BUILD_ROOT%{_libdir}"
+export PATH=$PATH:/usr/apache2/bin
+aclocal -I build/ac-macros
+autoconf
 ./configure \
     --prefix=%{_prefix} \
     --exec-prefix=%{_prefix} \
@@ -68,13 +71,12 @@
     --mandir=%{_mandir} \
     --with-ssl \
     --infodir=%{_infodir}
-make -j $CPUS
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rmdir $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp
@@ -106,19 +108,8 @@
 
 %files devel
 %defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*-config
-%dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, other) %{_datadir}/doc
-%{_datadir}/doc/*
-%{_datadir}/apr/build
-%dir %attr (0755, root, bin) %{_mandir}/man3
-%{_mandir}/man3/*
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
 
 %if %build_l10n
 %files l10n
@@ -128,6 +119,9 @@
 %endif
 
 %changelog
+* Sat Oct 14 2006 - [email protected]
+- disable parallel build as it breaks on multicpu systems
+- bump to 1.4.0
 * Tue Sep 26 2006 - [email protected]
 - Add Requires after check-deps.pl run
 * Fri Jul  7 2006 - [email protected]

--- a/SFEwxwidgets.spec	Fri Oct 13 20:44:28 2006 +0000
+++ b/SFEwxwidgets.spec	Sun Oct 15 03:39:06 2006 +0000
@@ -77,6 +77,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd ..
 
+cd $RPM_BUILD_ROOT%{_bindir}
+rm -f wx-config
+ln -s ../lib/wx/config/gtk2-unicode-release-2.6 wx-config
+
 %if %build_l10n
 %else
 # REMOVE l10n FILES
@@ -111,6 +115,8 @@
 %endif
 
 %changelog
+* Sat Oct 14 2006 - [email protected]
+- fix wx-config to be a relative symlink
 * Mon Jul 10 2006 - [email protected]
 - rename to SFEwxwidgets
 - delete -share subpkg

--- a/SUNWgnome-project.spec	Fri Oct 13 20:44:28 2006 +0000
+++ b/SUNWgnome-project.spec	Sun Oct 15 03:39:06 2006 +0000
@@ -191,11 +191,13 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
 %attr (-, root, other) %{_datadir}/locale
-%dir %attr (0755, root, other) %{_datadir}/gnome/help
+%dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/[a-z]*
 %endif
 
 %changelog
+* Sat Oct 14 2006 - [email protected]
+- fix /usr/share/gnome attributes in l10n subpkg
 * Wed Oct 11 2006 - [email protected]
 - fix icondir permissions
 * Sun Jul 23 2006 - [email protected]

--- a/patches/f-spot-01-solaris.diff	Fri Oct 13 20:44:28 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-diff -r -u f-spot-0.2.0/src/f-spot.in f-spot-0.2.0/src/f-spot.in
---- f-spot-0.2.0/src/f-spot.in	2006-03-01 15:51:19.000000000 +0800
-+++ f-spot-0.2.0/src/f-spot.in	2006-09-06 14:32:25.282103000 +0800
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@

--- a/patches/mono-01-solaris.diff	Fri Oct 13 20:44:28 2006 +0000
+++ b/patches/mono-01-solaris.diff	Sun Oct 15 03:39:06 2006 +0000
@@ -1,5 +1,5 @@
---- mono-1.1.16.1/mono/mini/mini-arch.h.patch01	2006-07-15 20:41:19.494747000 -0400
-+++ mono-1.1.16.1/mono/mini/mini-arch.h	2006-07-15 20:42:32.003687000 -0400
+--- mono-1.1.18/mono/mini/mini-arch.h.patch01	2006-08-25 15:35:16.000000000 -0400
++++ mono-1.1.18/mono/mini/mini-arch.h	2006-10-14 15:40:26.924195000 -0400
 @@ -1,13 +1,13 @@
  #ifndef __MONO_MINI_ARCH_H__
  #define __MONO_MINI_ARCH_H__
@@ -16,8 +16,8 @@
  #include "mini-sparc.h"
  #elif defined(__s390__) || defined(s390)
  # if defined(__s390x__)
---- mono-1.1.16.1/mono/mini/mini-ops.h.patch01	2006-07-15 20:55:51.471801000 -0400
-+++ mono-1.1.16.1/mono/mini/mini-ops.h	2006-07-15 20:56:20.744088000 -0400
+--- mono-1.1.18/mono/mini/mini-ops.h.patch01	2006-10-11 20:10:21.000000000 -0400
++++ mono-1.1.18/mono/mini/mini-ops.h	2006-10-14 15:40:27.444256000 -0400
 @@ -525,7 +525,7 @@
  MINI_OP(OP_MEMORY_BARRIER, "memory_barrier")
  
@@ -36,11 +36,11 @@
  MINI_OP(OP_SPARC_OUTARG_REGPAIR,   "sparc_outarg_regpair")
  MINI_OP(OP_SPARC_OUTARG_MEM,       "sparc_outarg_mem")
  MINI_OP(OP_SPARC_OUTARG_MEMPAIR,   "sparc_outarg_mempair")
---- mono-1.1.16.1/mono/mini/mini-x86.c.patch01	2006-07-15 20:59:50.579230000 -0400
-+++ mono-1.1.16.1/mono/mini/mini-x86.c	2006-07-15 22:25:04.707446000 -0400
+--- mono-1.1.18/mono/mini/mini-x86.c.patch01	2006-10-11 20:10:22.000000000 -0400
++++ mono-1.1.18/mono/mini/mini-x86.c	2006-10-14 15:40:27.471743000 -0400
 @@ -24,6 +24,10 @@
  #include "inssel.h"
- #include "cpu-pentium.h"
+ #include "cpu-x86.h"
  
 +#ifdef __SUNPRO_C
 +#define __FUNCTION__ __func__
@@ -49,7 +49,7 @@
  /* On windows, these hold the key returned by TlsAlloc () */
  static gint lmf_tls_offset = -1;
  static gint appdomain_tls_offset = -1;
-@@ -503,7 +507,22 @@
+@@ -507,7 +511,22 @@
  cpuid (int id, int* p_eax, int* p_ebx, int* p_ecx, int* p_edx)
  {
  	int have_cpuid = 0;
@@ -73,7 +73,7 @@
  	__asm__  __volatile__ (
  		"pushfl\n"
  		"popl %%eax\n"
-@@ -520,6 +539,7 @@
+@@ -524,6 +543,7 @@
  		:
  		: "%eax", "%edx"
  	);
@@ -81,7 +81,7 @@
  #else
  	__asm {
  		pushfd
-@@ -569,11 +589,19 @@
+@@ -573,11 +593,19 @@
  #ifndef _MSC_VER
  	guint16 fpcw;
  
@@ -101,23 +101,19 @@
  #else
  	_control87 (_PC_53, MCW_PC);
  #endif
---- mono-1.1.16.1/mono/mini/mini-codegen.c.patch01	2006-07-15 22:27:07.496114000 -0400
-+++ mono-1.1.16.1/mono/mini/mini-codegen.c	2006-07-15 22:27:49.926265000 -0400
-@@ -24,10 +24,10 @@
- #if defined(__x86_64__)
- const char * const amd64_desc [OP_LAST];
- static const char*const * ins_spec = amd64_desc;
--#elif defined(__sparc__) || defined(sparc)
-+#elif defined(__sparc__) || defined(sparc) || defined(__sparc)
+--- mono-1.1.18/mono/mini/mini-codegen.c.patch01	2006-10-11 20:10:22.000000000 -0400
++++ mono-1.1.18/mono/mini/mini-codegen.c	2006-10-14 15:42:37.812408000 -0400
+@@ -27,7 +27,7 @@
+ #elif defined(__sparc__) || defined(sparc)
  const char * const sparc_desc [OP_LAST];
  static const char*const * ins_spec = sparc_desc;
 -#elif defined(__i386__)
 +#elif defined(__i386__) || defined(__i386)
- extern const char * const pentium_desc [OP_LAST];
- static const char*const * ins_spec = pentium_desc;
+ extern const char * const x86_desc [OP_LAST];
+ static const char*const * ins_spec = x86_desc;
  #elif defined(__ia64__)
---- mono-1.1.16.1/scripts/mono-find-provides.in.patch01	2006-05-10 18:31:47.000000000 -0400
-+++ mono-1.1.16.1/scripts/mono-find-provides.in	2006-07-15 20:31:49.051611000 -0400
+--- mono-1.1.18/scripts/mono-find-provides.in.patch01	2006-08-25 15:35:14.000000000 -0400
++++ mono-1.1.18/scripts/mono-find-provides.in	2006-10-14 15:40:28.049081000 -0400
 @@ -9,7 +9,7 @@
  #
  
@@ -127,8 +123,8 @@
  monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
  
  # Only include files with /gac/ in path
---- mono-1.1.16.1/scripts/mono-find-requires.in.patch01	2006-05-10 18:31:47.000000000 -0400
-+++ mono-1.1.16.1/scripts/mono-find-requires.in	2006-07-15 20:31:49.052194000 -0400
+--- mono-1.1.18/scripts/mono-find-requires.in.patch01	2006-08-25 15:35:14.000000000 -0400
++++ mono-1.1.18/scripts/mono-find-requires.in	2006-10-14 15:40:28.391832000 -0400
 @@ -9,7 +9,7 @@
  #
  
@@ -138,8 +134,8 @@
  monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
  
  a=`which "$0"`
---- mono-1.1.16.1/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs.patch01	2006-07-05 17:59:23.000000000 -0400
-+++ mono-1.1.16.1/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs	2006-07-15 20:31:49.050912000 -0400
+--- mono-1.1.18/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs.patch01	2006-07-05 17:59:23.000000000 -0400
++++ mono-1.1.18/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs	2006-10-14 15:40:28.392798000 -0400
 @@ -40,12 +40,12 @@
  	public class Catalog {
  		private Catalog () {}
@@ -174,8 +170,8 @@
  		static extern IntPtr ngettext (IntPtr singular, IntPtr plural, Int32 n);
  		
  		public static String GetPluralString (String s, String p, Int32 n)
---- mono-1.1.16.1/mcs/class/Mono.Posix/Mono.Posix/Catalog.cs.patch01	2006-04-14 13:50:00.000000000 -0400
-+++ mono-1.1.16.1/mcs/class/Mono.Posix/Mono.Posix/Catalog.cs	2006-07-15 20:31:49.029020000 -0400
+--- mono-1.1.18/mcs/class/Mono.Posix/Mono.Posix/Catalog.cs.patch01	2006-04-14 13:50:00.000000000 -0400
++++ mono-1.1.18/mcs/class/Mono.Posix/Mono.Posix/Catalog.cs	2006-10-14 15:40:28.393599000 -0400
 @@ -37,12 +37,12 @@
  
  	[Obsolete ("Use Mono.Unix.Catalog")]
@@ -210,9 +206,9 @@
  		static extern IntPtr ngettext (IntPtr singular, IntPtr plural, Int32 n);
  		
  		public static String GetPluralString (String s, String p, Int32 n)
---- mono-1.1.16.1/configure.in.patch01	2006-07-15 22:36:38.764548000 -0400
-+++ mono-1.1.16.1/configure.in	2006-07-15 22:36:55.542947000 -0400
-@@ -1412,9 +1412,9 @@
+--- mono-1.1.18/configure.in.patch01	2006-10-11 20:10:33.000000000 -0400
++++ mono-1.1.18/configure.in	2006-10-14 15:40:28.395892000 -0400
+@@ -1373,9 +1373,9 @@
  	],
  	AC_MSG_RESULT(no)))
  

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/subversion-01-libneon.la.diff	Sun Oct 15 03:39:06 2006 +0000
@@ -0,0 +1,11 @@
+--- subversion-1.4.0/build/ac-macros/neon.m4.orig	2006-10-14 23:21:27.869027000 -0400
++++ subversion-1.4.0/build/ac-macros/neon.m4	2006-10-14 23:24:02.641291000 -0400
+@@ -133,7 +133,7 @@
+            test "$svn_allowed_neon" = "any"; then
+             svn_allowed_neon_on_system="yes"
+             SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`]
+-            NEON_LIBS=`$neon_config --la-file`
++            NEON_LIBS=`$neon_config --libs`
+             CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"]
+             svn_lib_neon="yes"
+             break