--- a/ChangeLog	Mon Apr 02 15:40:18 2007 +0000
+++ b/ChangeLog	Mon Apr 02 15:54:31 2007 +0000
@@ -1,16 +1,29 @@
+2007-04-02  Damien Carbery <[email protected]>
+
+	* SFExsane.spec: Rename zh dir to zh_CN in %install as zh a symlink to
+	  zh_CN and causing installation problems as a dir.
+	* linux-specs/msynctool.spec: Bump to 0.22.
+	* patches/obby-01-cast.diff, patches/net6-01-close-prototype.diff,
+	  patches/procmail-03-large-files.diff,
+	  patches/ufraw-01-ctime_r-fix.diff: Rework so that they apply.
+
 2007-04-02  Eric Boutilier  <[email protected]>
 
 	* SFEpython-pypdf.spec: (new) PDF toolkit library for Python
-	* SFEflvtool2.spec: (new) Manipulation tool for Macromedia Flash Video files (FLV)
+	* SFEflvtool2.spec: (new) Manipulation tool for Macromedia Flash Video
+	  files (FLV)
 	* SFEruby-fastercsv.spec: (new) Improved, faster CSV library for Ruby
-	* SFEruby-facets.spec: (new) Large set of base extensions/libraries for Ruby
+	* SFEruby-facets.spec: (new) Large set of base extensions/libraries for
+	  Ruby
 
 2007-04-01  Eric Boutilier  <[email protected]>
 
-	* SFEgetmail.spec: (new) Python App: Fetchmail replacement, plus add'l features
+	* SFEgetmail.spec: (new) Python App: Fetchmail replacement, plus add'l
+	  features
 	* SFElinkchecker.spec: (new) "    URL link checker
 	* SFEmoin.spec: (new)        "    Clone of WikiWiki
-	* SFEofflineimap.spec: (new) "    Two-way sync of IMAP/Maildir email boxes
+	* SFEofflineimap.spec: (new) "    Two-way sync of IMAP/Maildir email
+	  boxes
 	* SFEdenyhosts.spec: (new)   "    Help thwart ssh server attacks
 
 2007-04-01  Jeff Cai <[email protected]>
@@ -18,6 +31,7 @@
 	* SFEsdl-image.spec: added, sdl-image library.
 
 2007-03-31  Thomas Wagner <[email protected]>
+
         * SFEgd.spec: split into SFEgd SFEgd-devel
                       Bump to 2.0.34
                       new Url / Source

--- a/SFExsane.spec	Mon Apr 02 15:40:18 2007 +0000
+++ b/SFExsane.spec	Mon Apr 02 15:54:31 2007 +0000
@@ -50,6 +50,10 @@
 cd $RPM_BUILD_ROOT%{_libdir} & ln -s %{_bindir}/xsane $RPM_BUILD_ROOT%{_libdir}/gimp/2.0/plug-ins
 
 %if %build_l10n
+# Rename zh dir to zh_CN as zh is a symlink to zh_CN and causing installation
+# problems as a dir.
+cd $RPM_BUILD_ROOT%{_datadir}/locale
+mv zh zh_CN
 %else
 # REMOVE l10n FILES
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
@@ -81,6 +85,10 @@
 %endif
 
 %changelog
+* Mon Apr 02 2007 - [email protected]
+- Rename zh dir to zh_CN in %install as zh a symlink to zh_CN and causing
+  installation problems as a dir.
+
 * Tue Mar 20 2007 - [email protected]
 - Split into 2 files, SFExsane.spec and 
   linux-specs/xsane.spec.

--- a/linux-specs/msynctool.spec	Mon Apr 02 15:40:18 2007 +0000
+++ b/linux-specs/msynctool.spec	Mon Apr 02 15:54:31 2007 +0000
@@ -75,8 +75,8 @@
 %{_mandir}/man1/*.1*
 
 %changelog
-* Fri Mar 30 2007 - [email protected]
-- Bump to 0.22. Change source tarball to bz2.
+* Mon Apr 02 2007 - [email protected]
+- Bump to 0.22.
 
 * Tue Nov 14 2006 - [email protected]
 - Initial version

--- a/patches/obby-01-cast.diff	Mon Apr 02 15:40:18 2007 +0000
+++ b/patches/obby-01-cast.diff	Mon Apr 02 15:54:31 2007 +0000
@@ -1,5 +1,5 @@
---- obby-0.3.0rc1/src/colour.cpp.orig	2005-11-17 19:11:23.907047000 -0500
-+++ obby-0.3.0rc1/src/colour.cpp	2005-11-17 19:12:18.050462000 -0500
+--- obby-0.4.0rc2/src/colour.cpp.orig	2007-04-02 10:24:23.693956591 +0100
++++ obby-0.4.0rc2/src/colour.cpp	2007-04-02 10:26:48.158738719 +0100
 @@ -46,9 +46,9 @@
  bool obby::colour::similar_colour(const colour& colour) const
  {
@@ -12,5 +12,4 @@
 +	       abs((long)(m_blue - colour.m_blue)) < 32;
  }
  
- std::string
- 
+ std::string serialise::default_context_to<obby::colour>::

--- a/patches/procmail-03-large-files.diff	Mon Apr 02 15:40:18 2007 +0000
+++ b/patches/procmail-03-large-files.diff	Mon Apr 02 15:54:31 2007 +0000
@@ -134,7 +134,7 @@
 --- procmail-3.22/src/mailfold.h	2000-12-31 19:08:34.000000000 +1300
 +++ procmail-3.22-hacked/src/mailfold.h	2005-10-21 13:22:42.510379200 +1300
 @@ -1,7 +1,7 @@
- /*$Id: procmail-03-large-files.diff 92 2005-12-16 00:19:06Z gman $*/
+ /*$Id: mailfold.h,v 1.24 2000/10/25 08:13:20 guenther Exp $*/
  
  long
 - dump P((const int s,const int type,const char*source,long len));

--- a/patches/ufraw-01-ctime_r-fix.diff	Mon Apr 02 15:40:18 2007 +0000
+++ b/patches/ufraw-01-ctime_r-fix.diff	Mon Apr 02 15:54:31 2007 +0000
@@ -1,19 +1,3 @@
-diff -urN ufraw-0.7/ufraw_ufraw.c ufraw-0.7-hacked/ufraw_ufraw.c
---- ufraw-0.7/ufraw_ufraw.c	2006-02-23 22:23:42.000000000 +0100
-+++ ufraw-0.7-hacked/ufraw_ufraw.c	2006-03-17 12:10:11.439540000 +0100
-@@ -236,7 +236,11 @@
-     /* For MinG32 we don't have the thread safe ctime_r */
-     g_strlcpy(uf->conf->timestamp, ctime(&raw->timestamp), max_name);
- #else
--    ctime_r(&raw->timestamp, uf->conf->timestamp);
-+#   ifdef SOLARIS
-+       ctime_r(&raw->timestamp, uf->conf->timestamp,sizeof(uf->conf->timestamp));
-+#   else
-+       ctime_r(&raw->timestamp, uf->conf->timestamp);
-+#   endif
- #endif
-     if (uf->conf->timestamp[strlen(uf->conf->timestamp)-1]=='\n')
- 	uf->conf->timestamp[strlen(uf->conf->timestamp)-1] = '\0';
 --- ufraw-0.8/configure.ac.orig	2006-05-08 17:26:46.224736000 +0100
 +++ ufraw-0.8/configure.ac	2006-05-08 17:27:22.369585000 +0100
 @@ -32,9 +32,9 @@