- updated to 0.16.4

Changed files:
    bogofilter-dummy.patch -> 1.2
    bogofilter-home_etc.patch -> 1.2
    bogofilter.spec -> 1.54

diff --git a/bogofilter-dummy.patch b/bogofilter-dummy.patch
index e404e3a159c71a1990e02f4cd66bc3f1f4caba15..253698ab8d0cbfce747faadf265399816ec2c76f 100644 (file)
--- a/bogofilter-dummy.patch
+++ b/bogofilter-dummy.patch
@@ -1,10 +1,11 @@
---- configure.ac.old   2004-01-04 00:49:48.000000000 +0100
-+++ configure.ac       2004-01-04 00:49:42.000000000 +0100
-@@ -501,7 +501,7 @@
+diff -burN bogofilter-0.16.4.orig/configure.ac bogofilter-0.16.4/configure.ac
+--- bogofilter-0.16.4.orig/configure.ac        2004-02-05 18:40:11.998145456 +0100
++++ bogofilter-0.16.4/configure.ac     2004-02-05 19:07:20.235615736 +0100
+@@ -514,7 +514,7 @@
  export PATH
  
  need_my_gsl=1
--AC_ARG_WITH(included-gsl, AS_HELP_STRING([--with-included-gsl],[force use of shipped GSL rather than system GSL]),
+-AC_ARG_WITH(included-gsl, AC_HELP_STRING([--with-included-gsl],[force use of shipped GSL rather than system GSL]),
 +AC_ARG_WITH(included-gsl, ([--with-included-gsl],[force use of shipped GSL rather than system GSL]),
  if test "x$WITHVAL" != "xyes" ; then need_my_gsl=2 ; fi)
  

diff --git a/bogofilter-home_etc.patch b/bogofilter-home_etc.patch
index 78f1949908c85b3c47c706b01902701d70ed6b1f..2b40a504e2f9b9f473eb548b1c09829f7dbd8f7e 100644 (file)
--- a/bogofilter-home_etc.patch
+++ b/bogofilter-home_etc.patch
@@ -1,24 +1,23 @@
-diff -Nru bogofilter-0.15.8.orig/src/configfile.c bogofilter-0.15.8/src/configfile.c
---- bogofilter-0.15.8.orig/src/configfile.c    2003-10-06 00:01:40.000000000 +0200
-+++ bogofilter-0.15.8/src/configfile.c 2003-11-12 18:12:59.000000000 +0100
-@@ -195,8 +195,14 @@
+diff -burN bogofilter-0.16.4.orig/src/configfile.c bogofilter-0.16.4/src/configfile.c
+--- bogofilter-0.16.4.orig/src/configfile.c    2004-02-05 18:40:11.899160504 +0100
++++ bogofilter-0.16.4/src/configfile.c 2004-02-05 18:50:35.250396712 +0100
+@@ -213,7 +213,13 @@
+     int lineno = 0;
      FILE *fp;
      char *filename;
-     char *arg = NULL, *val = NULL;
-+    char *home_etc = getenv("HOME_ETC");              
++    char *home_etc = getenv("HOME_ETC");
  
--    filename = tildeexpand(fname, tilde_expand);
 +    if (home_etc && fname[0] == '~') {
-+      char buffer[1024];
-+      
-+      snprintf(buffer, 1024, "%s%s", home_etc, fname + 1);
-+      filename = xstrdup(buffer);
-+    } else filename = tildeexpand(fname, tilde_expand);
++        char buffer[1024];
++      snprintf(buffer, 1024, "%s%s", home_etc, fname+1);
++      filename=xstrdup(buffer);
++    } else
+     filename = tildeexpand(fname, tilde_expand);
  
      fp = fopen(filename, "r");
- 
---- bogofilter-0.15.8.orig/src/paths.c 2003-09-30 00:31:20.000000000 +0200
-+++ bogofilter-0.15.8/src/paths.c      2003-11-12 18:27:10.000000000 +0100
+diff -burN bogofilter-0.16.4.orig/src/paths.c bogofilter-0.16.4/src/paths.c
+--- bogofilter-0.16.4.orig/src/paths.c 2004-02-05 18:40:11.966150320 +0100
++++ bogofilter-0.16.4/src/paths.c      2004-02-05 18:58:56.031266448 +0100
 @@ -29,7 +29,7 @@
  #ifndef __riscos__
      { PR_ENV_BOGO, "BOGOFILTER_DIR", NULL },
@@ -28,11 +27,11 @@ diff -Nru bogofilter-0.15.8.orig/src/configfile.c bogofilter-0.15.8/src/configfi
  #else
      { PR_ENV_HOME, "Choices$Write",  BOGODIR },
      { PR_ENV_HOME, "Bogofilter$Dir", NULL },
-@@ -91,6 +91,7 @@
+@@ -94,6 +94,7 @@
      size_t path_size, env_size;
  
      env = getenv(var);
-+    if (env == NULL && strcmp(var, "HOME_ETC") == 0) env = getenv("HOME"); 
++    if (env == NULL && strcmp(var, "HOME_ETC") == 0) env = getenv("HOME");
      if (env == NULL || strlen(env) == 0) return NULL;
  
      env_size = strlen(env);

diff --git a/bogofilter.spec b/bogofilter.spec
index c0e7601e3b60079031a6ea29a9ed0d2eea7f3f1e..8aff2eaeacf552f440756b6a0b9dc91288b37cde 100644 (file)
--- a/bogofilter.spec
+++ b/bogofilter.spec
@@ -1,13 +1,13 @@
 Summary:       Bayesian Spam Filter
 Summary(pl):   Bayesjañski Filtr Antyspamowy
 Name:          bogofilter
-Version:       0.16.1
-Release:       2
+Version:       0.16.4
+Release:       1
 License:       GPL
 Group:         Applications/Mail
 Vendor:                Eric S. Raymond <esr@thyrsus.com>
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: ad68fef5c4116157d291c74492a149ab
+# Source0-md5: 3f20cdd44b80a08d2114c5d95d485915
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-dummy.patch
 URL:           http://bogofilter.sourceforge.net/
@@ -43,7 +43,7 @@ kt
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 
 %build
 rm -f missing