upgrading package: file 4.25 -> 4.26

file/file.patch

@@ -1,7 +1,7 @@
 Index: src/apprentice.c
---- src/apprentice.c.orig	2008-07-02 17:22:47 +0200
-+++ src/apprentice.c	2008-07-08 22:49:01 +0200
-@@ -688,6 +688,7 @@
+--- src/apprentice.c.orig	2008-07-26 17:03:55 +0200
++++ src/apprentice.c	2008-08-30 22:53:20 +0200
+@@ -697,6 +697,7 @@
  		file_oomem(ms, maxmagic * sizeof(*marray));
  		return -1;
  	}
@@ -10,8 +10,8 @@ Index: src/apprentice.c
  
  	/* print silly verbose header for USG compat. */
 Index: src/compress.c
---- src/compress.c.orig	2008-05-16 16:17:59 +0200
-+++ src/compress.c	2008-07-08 22:49:01 +0200
+--- src/compress.c.orig	2008-07-26 17:03:55 +0200
++++ src/compress.c	2008-08-30 22:53:20 +0200
 @@ -167,7 +167,7 @@
   * `safe' read for sockets and pipes.
   */
@@ -39,26 +39,10 @@ Index: src/compress.c
  #ifdef DEBUG
  			(void)fprintf(stderr, "Read failed (%s)\n",
  			    strerror(errno));
-Index: src/file.c
---- src/file.c.orig	2008-05-19 01:21:17 +0200
-+++ src/file.c	2008-07-08 22:49:01 +0200
-@@ -60,9 +60,10 @@
- #include <wchar.h>
- #endif
- 
--#include <getopt.h>
- #ifndef HAVE_GETOPT_LONG
--int getopt_long(int argc, char * const *argv, const char *optstring, const struct option *longopts, int *longindex);
-+#include "getopt_long.h"
-+#else
-+#include <getopt.h>
- #endif
- 
- #include <netinet/in.h>		/* for byte swapping */
 Index: src/file.h
---- src/file.h.orig	2008-07-02 17:22:47 +0200
-+++ src/file.h	2008-07-08 22:49:01 +0200
-@@ -356,7 +356,7 @@
+--- src/file.h.orig	2008-07-26 17:03:55 +0200
++++ src/file.h	2008-08-30 22:53:20 +0200
+@@ -370,7 +370,7 @@
  protected void file_showstr(FILE *, const char *, size_t);
  protected size_t file_mbswidth(const char *);
  protected const char *file_getbuffer(struct magic_set *);
@@ -67,7 +51,7 @@ Index: src/file.h
  protected int file_check_mem(struct magic_set *, unsigned int);
  protected int file_looks_utf8(const unsigned char *, size_t, unichar *, size_t *);
  
-@@ -377,9 +377,11 @@
+@@ -391,9 +391,11 @@
  #endif
  
  #ifndef HAVE_VASPRINTF
@@ -80,8 +64,8 @@ Index: src/file.h
  #endif
  
 Index: src/funcs.c
---- src/funcs.c.orig	2008-05-16 16:25:01 +0200
-+++ src/funcs.c	2008-07-08 22:49:01 +0200
+--- src/funcs.c.orig	2008-07-26 17:03:55 +0200
++++ src/funcs.c	2008-08-30 22:53:20 +0200
 @@ -29,6 +29,7 @@
  #include <stdarg.h>
  #include <stdlib.h>
@@ -90,7 +74,7 @@ Index: src/funcs.c
  #include <ctype.h>
  #if defined(HAVE_WCHAR_H)
  #include <wchar.h>
-@@ -337,3 +338,108 @@
+@@ -346,3 +347,108 @@
  #endif /* ENABLE_CONDITIONALS */
  	return 0;
  }
@@ -199,44 +183,9 @@ Index: src/funcs.c
 +}
 +#endif
 +
-Index: src/getopt_long.c
---- src/getopt_long.c.orig	2008-02-07 01:50:10 +0100
-+++ src/getopt_long.c	2008-07-08 22:49:01 +0200
-@@ -30,11 +30,12 @@
-  */
- 
- #include <assert.h>
--#include <err.h>
-+#include <stdarg.h>
- #include <errno.h>
--#include <getopt.h>
-+#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include "getopt_long.h"
- 
- #define REPLACE_GETOPT
- 
-@@ -73,6 +74,16 @@
- 
- #define	EMSG	""
- 
-+#define __P(x) x 
-+#define warnx file_warnx
-+void warnx(const char *fmt, ...)
-+{   
-+    va_list ap;
-+    va_start(ap, fmt);
-+    vfprintf(stderr, "WARNING: %s\n", ap);
-+    va_end(ap);
-+}
-+
- static int getopt_internal __P((int, char **, const char *));
- static int gcd __P((int, int));
- static void permute_args __P((int, int, int, char **));
 Index: src/getopt_long.h
---- /dev/null	2008-07-08 22:49:04 +0200
-+++ src/getopt_long.h	2008-07-08 22:49:01 +0200
+--- /dev/null	2008-08-30 22:55:00 +0200
++++ src/getopt_long.h	2008-08-30 22:53:20 +0200
 @@ -0,0 +1,14 @@
 +#ifndef __GETOPT_LONG_H
 +#define __GETOPT_LONG_H 1
@@ -253,9 +202,9 @@ Index: src/getopt_long.h
 +
 +#endif
 Index: src/magic.c
---- src/magic.c.orig	2008-05-16 16:25:01 +0200
-+++ src/magic.c	2008-07-08 22:49:01 +0200
-@@ -324,7 +324,7 @@
+--- src/magic.c.orig	2008-07-26 17:03:55 +0200
++++ src/magic.c	2008-08-30 22:53:20 +0200
+@@ -334,7 +334,7 @@
  	if (ispipe) {
  		ssize_t r = 0;
  
@@ -265,8 +214,8 @@ Index: src/magic.c
  			nbytes += r;
  			if (r < PIPE_BUF) break;
 Index: src/softmagic.c
---- src/softmagic.c.orig	2008-04-29 03:10:49 +0200
-+++ src/softmagic.c	2008-07-08 22:49:01 +0200
+--- src/softmagic.c.orig	2008-07-28 19:25:21 +0200
++++ src/softmagic.c	2008-08-30 22:53:20 +0200
 @@ -302,10 +302,9 @@
  }
  

file/file.spec

@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_api_c   4.25
+%define       V_api_c   4.26
 %define       V_api_pl  0.89
 
 #   package information
@@ -36,7 +36,7 @@ Class:        BASE
 Group:        Filesystem
 License:      BSD
 Version:      %{V_api_c}
-Release:      20080807
+Release:      20080830
 
 #   package options
 %option       with_perl  no