rpms/spamassassin/devel spamassassin-3.0.3-r122144.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 spamassassin.spec, 1.35, 1.36

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sun Apr 3 10:00:59 UTC 2005 

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24083

Modified Files:
	.cvsignore spamassassin.spec 
Added Files:
	spamassassin-3.0.3-r122144.patch 
Log Message:
test svn 3.0 stable r122144 snapshot


spamassassin-3.0.3-r122144.patch:
 MANIFEST                                 |    1 
 MANIFEST.SKIP                            |    1 
 lib/Mail/SpamAssassin.pm                 |    8 +-
 lib/Mail/SpamAssassin/Conf.pm            |  109 +++++++++++++++++++++----------
 lib/Mail/SpamAssassin/DBBasedAddrList.pm |   11 +--
 lib/Mail/SpamAssassin/Reporter.pm        |    4 -
 rules/50_scores.cf                       |    2 
 spamassassin.raw                         |    2 
 spamassassin.spec                        |    2 
 spamd/spamd.raw                          |    8 +-
 t/data/nice/spf1                         |    6 -
 t/data/spam/spf1                         |   22 ++++++
 t/spf.t                                  |    9 ++
 13 files changed, 128 insertions(+), 57 deletions(-)

--- NEW FILE spamassassin-3.0.3-r122144.patch ---
diff -urN Mail-SpamAssassin-3.0.2/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAssassin-3.0.3-r122144/lib/Mail/SpamAssassin/Conf.pm
--- Mail-SpamAssassin-3.0.2/lib/Mail/SpamAssassin/Conf.pm	2004-12-15 17:10:03.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/lib/Mail/SpamAssassin/Conf.pm	2005-04-02 23:27:35.000000000 -1000
@@ -1145,6 +1145,20 @@
     },
   });
 
+=item spamcop_max_report_size		(default: 50)
+
+The size (in kilobytes) at which SpamAssassin will truncate messages
+reported to SpamCop.  The default is the maximum size SpamCop will
+accept at the time of release.
+
+=cut
+
+  push (@cmds, {
+    setting => 'spamcop_max_report_size',
+    default => 50,
+    type => $CONF_TYPE_NUMERIC
+  });
+
 =item trusted_networks ip.add.re.ss[/mask] ...   (default: none)
 
 What networks or hosts are 'trusted' in your setup.  B<Trusted> in this case
@@ -2222,7 +2236,11 @@
         $self->{descriptions}->{$1} = "Found a $2 header";
       }
       else {
-        $self->{parser}->add_test (split(/\s+/,$value,2), $TYPE_HEAD_TESTS);
+	my @values = split(/\s+/, $value, 2);
+	if (@values != 2) {
+	  return $MISSING_REQUIRED_VALUE;
+	}
+        $self->{parser}->add_test (@values, $TYPE_HEAD_TESTS);
       }
     }
   });
@@ -2256,7 +2274,11 @@
         $self->{parser}->add_test ($1, $2, $TYPE_BODY_EVALS);
       }
       else {
-        $self->{parser}->add_test (split(/\s+/,$value,2), $TYPE_BODY_TESTS);
+	my @values = split(/\s+/, $value, 2);
+	if (@values != 2) {
+	  return $MISSING_REQUIRED_VALUE;
+	}
+        $self->{parser}->add_test (@values, $TYPE_BODY_TESTS);
       }
     }
   });
@@ -2285,7 +2307,11 @@
     is_priv => 1,
     code => sub {
       my ($self, $key, $value, $line) = @_;
-      $self->{parser}->add_test (split(/\s+/,$value,2), $TYPE_URI_TESTS);
+      my @values = split(/\s+/, $value, 2);
+      if (@values != 2) {
+        return $MISSING_REQUIRED_VALUE;
+      }
+      $self->{parser}->add_test (@values, $TYPE_URI_TESTS);
     }
   });
 
@@ -2315,7 +2341,11 @@
       if ($value =~ /^(\S+)\s+eval:(.*)$/) {
         $self->{parser}->add_test ($1, $2, $TYPE_RAWBODY_EVALS);
       } else {
-        $self->{parser}->add_test (split(/\s+/,$value,2), $TYPE_RAWBODY_TESTS);
+	my @values = split(/\s+/, $value, 2);
+	if (@values != 2) {
+	  return $MISSING_REQUIRED_VALUE;
+	}
+        $self->{parser}->add_test (@values, $TYPE_RAWBODY_TESTS);
       }
     }
   });
@@ -2344,7 +2374,11 @@
       if ($value =~ /^(\S+)\s+eval:(.*)$/) {
         $self->{parser}->add_test ($1, $2, $TYPE_FULL_EVALS);
       } else {
-        $self->{parser}->add_test (split(/\s+/,$value,2), $TYPE_FULL_TESTS);
+	my @values = split(/\s+/, $value, 2);
+	if (@values != 2) {
+	  return $MISSING_REQUIRED_VALUE;
+	}
+        $self->{parser}->add_test (@values, $TYPE_FULL_TESTS);
       }
     }
   });
@@ -2383,7 +2417,11 @@
     is_priv => 1,
     code => sub {
       my ($self, $key, $value, $line) = @_;
-      $self->{parser}->add_test (split(/\s+/,$value,2), $TYPE_META_TESTS);
+      my @values = split(/\s+/, $value, 2);
+      if (@values != 2) {
+        return $MISSING_REQUIRED_VALUE;
+      }
+      $self->{parser}->add_test (@values, $TYPE_META_TESTS);
     }
   });
 
@@ -2456,6 +2494,36 @@
 
 =over 4
 
+=item version_tag string
+
+This tag is appended to the SA version in the X-Spam-Status header. You should
+include it when modify your ruleset, especially if you plan to distribute it.
+A good choice for I<string> is your last name or your initials followed by a
+number which you increase with each change.
+
+The version_tag will be lowercased, and any non-alphanumeric or period
+character will be replaced by an underscore.
+
+e.g.
+
+  version_tag myrules1    # version=2.41-myrules1
+
+=cut
+
+  push (@cmds, {
+    setting => 'version_tag',
+    is_admin => 1,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+      my $tag = lc($value);
+      $tag =~ tr/a-z0-9./_/c;
+      foreach (@Mail::SpamAssassin::EXTRA_VERSION) {
+        if($_ eq $tag) { $tag = undef; last; }
+      }
+      push(@Mail::SpamAssassin::EXTRA_VERSION, $tag) if($tag);
+    }
+  });
+
 =item test SYMBOLIC_TEST_NAME (ok|fail) Some string to test against
 
 Define a regression testing string. You can have more than one regression test
@@ -3051,35 +3119,6 @@
     }
   });
 
-=item version_tag string
-
-This tag is appended to the SA version in the X-Spam-Status header. You should
-include it when modify your ruleset, especially if you plan to distribute it.
-A good choice for I<string> is your last name or your initials followed by a
-number which you increase with each change.
-
-The version_tag will be lowercased, and any non-alphanumeric or period
-character will be replaced by an underscore.
-
-e.g.
-
-  version_tag myrules1    # version=2.41-myrules1
-
-=cut
-
-  push (@cmds, {
-    setting => 'version_tag',
-    code => sub {
-      my ($self, $key, $value, $line) = @_;
-      my $tag = lc($value);
-      $tag =~ tr/a-z0-9./_/c;
-      foreach (@Mail::SpamAssassin::EXTRA_VERSION) {
-        if($_ eq $tag) { $tag = undef; last; }
-      }
-      push(@Mail::SpamAssassin::EXTRA_VERSION, $tag) if($tag);
-    }
-  });
-
 =back
 
 =head1 TEMPLATE TAGS
diff -urN Mail-SpamAssassin-3.0.2/lib/Mail/SpamAssassin/DBBasedAddrList.pm Mail-SpamAssassin-3.0.3-r122144/lib/Mail/SpamAssassin/DBBasedAddrList.pm
--- Mail-SpamAssassin-3.0.2/lib/Mail/SpamAssassin/DBBasedAddrList.pm	2004-10-22 05:21:03.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/lib/Mail/SpamAssassin/DBBasedAddrList.pm	2005-04-02 23:27:35.000000000 -1000
@@ -163,11 +163,12 @@
     # try to delete any per-IP entries for this addr as well.
     # could be slow...
     my $mailaddr = $1;
-    my @keys = grep { /^\Q${mailaddr}\E\|ip=\d+\.\d+$/ }
-					keys %{$self->{accum}};
-    foreach my $key (@keys) {
-      delete $self->{accum}->{$key};
-      delete $self->{accum}->{$key.'|totscore'};
+
+    while (my ($key, $value) = each %{$self->{accum}}) {
+      # regex will catch both key and key|totscore entries and delete them
+      if ($key =~ /^\Q${mailaddr}\E\|/) {
+        delete $self->{accum}->{$key};
+      }
     }
   }
 }
diff -urN Mail-SpamAssassin-3.0.2/lib/Mail/SpamAssassin/Reporter.pm Mail-SpamAssassin-3.0.3-r122144/lib/Mail/SpamAssassin/Reporter.pm
--- Mail-SpamAssassin-3.0.2/lib/Mail/SpamAssassin/Reporter.pm	2004-12-15 17:10:03.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/lib/Mail/SpamAssassin/Reporter.pm	2005-04-02 23:27:35.000000000 -1000
@@ -428,8 +428,8 @@
 	      );
 
   # truncate message
-  if (length($original) > 64*1024) {
-    substr($original,(64*1024)) = "\n[truncated by SpamAssassin]\n";
+  if (length($original) > $self->{conf}->{spamcop_max_report_size}*1024) {
+    substr($original,($self->{conf}->{spamcop_max_report_size}*1024)) = "\n[truncated by SpamAssassin]\n";
   }
 
   my $body = <<"EOM";
diff -urN Mail-SpamAssassin-3.0.2/lib/Mail/SpamAssassin.pm Mail-SpamAssassin-3.0.3-r122144/lib/Mail/SpamAssassin.pm
--- Mail-SpamAssassin-3.0.2/lib/Mail/SpamAssassin.pm	2004-12-15 17:10:03.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/lib/Mail/SpamAssassin.pm	2005-04-02 23:27:35.000000000 -1000
@@ -98,19 +98,19 @@
   @site_rules_path
 };
 
-$VERSION = "3.000002";      # update after release (same format as perl $])
-$IS_DEVEL_BUILD = 0;        # change for release versions
+$VERSION = "3.000003";      # update after release (same format as perl $])
+$IS_DEVEL_BUILD = 1;        # change for release versions
 
 @ISA = qw();
 
 # SUB_VERSION is now just <yyyy>-<mm>-<dd>
-$SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2004-11-16 16:50:46 -0800 (Tue, 16 Nov 2004) $ updated by SVN'))[1];
+$SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2004-12-15 18:21:22 -1000 (Wed, 15 Dec 2004) $ updated by SVN'))[1];
 
 # If you hacked up your SA, you should add a version_tag to you .cf files.
 # This variable should not be modified directly.
 @EXTRA_VERSION = qw();
 if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) {
-  push(@EXTRA_VERSION, ( 'r' . qw{$LastChangedRevision: 76069 $ updated by SVN}[1] ));
+  push(@EXTRA_VERSION, ( 'r' . qw{$LastChangedRevision: 122144 $ updated by SVN}[1] ));
 }
 
 sub Version { $VERSION=~/^(\d+)\.(\d\d\d)(\d\d\d)$/; join('-', sprintf("%d.%d.%d",$1,$2,$3), @EXTRA_VERSION) }
diff -urN Mail-SpamAssassin-3.0.2/MANIFEST Mail-SpamAssassin-3.0.3-r122144/MANIFEST
--- Mail-SpamAssassin-3.0.2/MANIFEST	2004-12-15 17:10:04.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/MANIFEST	2005-04-02 23:27:49.000000000 -1000
@@ -279,6 +279,7 @@
 t/data/spam/bsmtp
 t/data/spam/dnsbl.eml
 t/data/spam/gtube.eml
+t/data/spam/spf1
 t/data/testplugin.pm
 t/data/whitelists/action.eff.org
 t/data/whitelists/amazon_co_uk_ship
diff -urN Mail-SpamAssassin-3.0.2/MANIFEST.SKIP Mail-SpamAssassin-3.0.3-r122144/MANIFEST.SKIP
--- Mail-SpamAssassin-3.0.2/MANIFEST.SKIP	2004-10-22 05:21:08.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/MANIFEST.SKIP	2005-04-02 23:27:49.000000000 -1000
@@ -117,3 +117,4 @@
 tmon.out
 todo$
 wordfreqs/.*
+^build/buildbot_ready$
diff -urN Mail-SpamAssassin-3.0.2/rules/50_scores.cf Mail-SpamAssassin-3.0.3-r122144/rules/50_scores.cf
--- Mail-SpamAssassin-3.0.2/rules/50_scores.cf	2004-10-22 05:21:11.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/rules/50_scores.cf	2005-04-02 23:27:40.000000000 -1000
@@ -683,7 +683,7 @@
 # otherwise.  The penalties for an *incorrect* record, however, are large.  ;)
 ifplugin Mail::SpamAssassin::Plugin::SPF
 score SPF_PASS -0.001
-score SPF_FAIL 0 0 0 0.875
+score SPF_FAIL 0 0.001 0 0.875
 score SPF_SOFTFAIL 0.500 0.842 0.500 0.500
 score SPF_HELO_PASS -0.001
 score SPF_HELO_FAIL 0 0.405 0 0.001
diff -urN Mail-SpamAssassin-3.0.2/spamassassin.raw Mail-SpamAssassin-3.0.3-r122144/spamassassin.raw
--- Mail-SpamAssassin-3.0.2/spamassassin.raw	2004-12-15 17:10:04.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/spamassassin.raw	2005-04-02 23:27:49.000000000 -1000
@@ -100,7 +100,7 @@
 
 sub print_version {
   print "SpamAssassin version " . Mail::SpamAssassin::Version() . "\n"
-      . "  running on Perl version " . join(".", map { $_ * 1 } ($] =~ /(\d)\.(\d{3})(\d{3})/ )) . "\n";
+      . "  running on Perl version " . join(".", map { $_||=0; $_*1 } ($] =~ /(\d)\.(\d{3})(\d{3})?/ )) . "\n";
 }
 
 sub print_usage_and_exit {
diff -urN Mail-SpamAssassin-3.0.2/spamassassin.spec Mail-SpamAssassin-3.0.3-r122144/spamassassin.spec
--- Mail-SpamAssassin-3.0.2/spamassassin.spec	2004-12-15 17:10:04.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/spamassassin.spec	2005-04-02 23:27:49.000000000 -1000
@@ -4,7 +4,7 @@
 # the perl-Mail-SpamAssassin rpm for the modules only.
 
 # the version in the tar name
-%define real_version 3.0.2
+%define real_version 3.0.3
 # the display version number
 %define version %{real_version}
 
diff -urN Mail-SpamAssassin-3.0.2/spamd/spamd.raw Mail-SpamAssassin-3.0.3-r122144/spamd/spamd.raw
--- Mail-SpamAssassin-3.0.2/spamd/spamd.raw	2004-10-22 05:21:26.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/spamd/spamd.raw	2005-04-02 23:27:49.000000000 -1000
@@ -84,7 +84,7 @@
 
 sub print_version {
   printf("%s version %s\n", "SpamAssassin Server", Mail::SpamAssassin::Version());
-  printf("  running on Perl %s\n", join(".", map { $_*1 } ($] =~ /(\d)\.(\d{3})(\d{3})/)));
+  printf("  running on Perl %s\n", join(".", map { $_||=0; $_*1 } ($] =~ /(\d)\.(\d{3})(\d{3})?/)));
   eval { require IO::Socket::SSL; };
   printf("  with SSL support (%s %s)\n", "IO::Socket::SSL", $IO::Socket::SSL::VERSION) unless ($@);
 }
@@ -1350,7 +1350,7 @@
   my $ident_username = ident_lookup( $client, $opt{'ident-timeout'} );
   my $dn = $ident_username || 'NONE';    # display name
   warn "ident_username = $dn, spamc_username = $username\n" if $opt{'debug'};
-  if ( $username ne $ident_username ) {
+  if ( !defined($ident_username) || $username ne $ident_username ) {
     logmsg( "fatal: ident username ($dn) does not match "
         . "spamc username ($username)" );
     return 0;
@@ -2146,8 +2146,8 @@
 is to setuid() to the user running C<spamc>, if C<spamd> is running
 as root.
 
-Note: "--username=root" disables the setuid() functionality and leaves
-spamd running as root.
+Note: "--username=root" is not a valid option.  If specified, C<spamd> will
+exit with a fatal error on startup.
 
 Note: If this option is set to a non-root user, and spamd is to run on
 a privileged port (any < 1024, default 783 or via -p), the parent will
diff -urN Mail-SpamAssassin-3.0.2/t/data/nice/spf1 Mail-SpamAssassin-3.0.3-r122144/t/data/nice/spf1
--- Mail-SpamAssassin-3.0.2/t/data/nice/spf1	2004-10-22 05:21:22.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/t/data/nice/spf1	2005-04-02 23:27:46.000000000 -1000
@@ -1,10 +1,10 @@
-Return-Path: <newsalerts-noreply at google.com>
-Received: from proxy.google.com (proxy.google.com [216.239.51.5]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm-google-news-alerts at jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Return-Path: <newsalerts-noreply at dnsbltest.spamassassin.org>
+Received: from bugzilla.spamassassin.org (bugzilla.spamassassin.org [64.142.3.173]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm-google-news-alerts at jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
 Received: by proxy.google.com with SMTP id so1951389 for <jm-google-news-alerts at jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
 Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
 Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b at persist.google.com>
 Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
-From: newsalerts-noreply at google.com
+From: newsalerts-noreply at dnsbltest.spamassassin.org
 To: jm-google-news-alerts at jmason.org
 Subject: Google News Alert - spamassassin
 MIME-Version: 1.0
diff -urN Mail-SpamAssassin-3.0.2/t/data/spam/spf1 Mail-SpamAssassin-3.0.3-r122144/t/data/spam/spf1
--- Mail-SpamAssassin-3.0.2/t/data/spam/spf1	1969-12-31 14:00:00.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/t/data/spam/spf1	2005-04-02 23:27:45.000000000 -1000
@@ -0,0 +1,22 @@
+Return-Path: <newsalerts-noreply at dnsbltest.spamassassin.org>
+Received: from bugzilla.spamassassin.org (bugzilla.spamassassin.org [65.214.43.155]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm-google-news-alerts at jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: by proxy.google.com with SMTP id so1951389 for <jm-google-news-alerts at jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b at persist.google.com>
+Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+From: newsalerts-noreply at dnsbltest.spamassassin.org
+To: jm-google-news-alerts at jmason.org
+Subject: Google News Alert - spamassassin
+MIME-Version: 1.0
+Content-Type: text/plain; charset="ISO-8859-1";
+
+SWSOFT Unveils Plesk 7, Deployed by 1&1
+Web Host Industry Review - USA
+... The software also features a newly designed Windows XP-like user interface,
+is equipped SpamAssassin, an open source anti-spam tool, and includes
+"Application ...
+<http://thewhir.com/marketwatch/sws021004.cfm>
+See all stories on this topic:
+<http://news.google.com/news?hl=en&lr=&ie=UTF-8&oe=utf8&client=google&num=30&newsc
+lusterurl=http://thewhir.com/marketwatch/sws021004.cfm>
+
diff -urN Mail-SpamAssassin-3.0.2/t/spf.t Mail-SpamAssassin-3.0.3-r122144/t/spf.t
--- Mail-SpamAssassin-3.0.2/t/spf.t	2004-10-22 05:21:17.000000000 -1000
+++ Mail-SpamAssassin-3.0.3-r122144/t/spf.t	2005-04-02 23:27:47.000000000 -1000
@@ -16,7 +16,7 @@
 
 BEGIN {
   
-  plan tests => (DO_RUN ? 2 : 0);
+  plan tests => (DO_RUN ? 4 : 0);
 
 };
 
@@ -32,3 +32,10 @@
 sarun ("-t < data/nice/spf1", \&patterns_run_cb);
 ok_all_patterns();
 
+%patterns = (
+    q{ SPF_HELO_FAIL }, 'helo_fail',
+    q{ SPF_FAIL }, 'fail',
+);
+
+sarun ("-t < data/spam/spf1", \&patterns_run_cb);
+ok_all_patterns();


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	20 Dec 2004 19:59:53 -0000	1.20
+++ .cvsignore	3 Apr 2005 10:00:37 -0000	1.21
@@ -1,5 +1 @@
-Mail-SpamAssassin-3.0.0-rc3.tar.bz2
-Mail-SpamAssassin-3.0.0-rc4.tar.bz2
-Mail-SpamAssassin-3.0.0.tar.bz2
-Mail-SpamAssassin-3.0.1.tar.bz2
 Mail-SpamAssassin-3.0.2.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- spamassassin.spec	24 Mar 2005 16:31:13 -0000	1.35
+++ spamassassin.spec	3 Apr 2005 10:00:38 -0000	1.36
@@ -8,7 +8,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.0.2
-Release: 5
+Release: 6.fc4
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -19,6 +19,11 @@
 Source5: spamassassin.sysconfig
 Source10: spamassassin-helper.sh
 Source99: filter-requires-spamassassin.sh
+# Patches 0-99 are RH specific
+# none yet
+# Patches 100+ are SVN backports (DO NOT REUSE!)
+Patch100: spamassassin-3.0.3-r122144.patch
+# end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
 Prefix: %{_prefix}
@@ -57,6 +62,11 @@
 
 %prep
 %setup -q -n Mail-SpamAssassin-%{version}
+# Patches 0-99 are RH specific
+# none yet
+# Patches 100+ are SVN backports (DO NOT REUSE!)
+%patch100 -p1
+# end of patches
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -141,6 +151,9 @@
 exit 0
 
 %changelog
+* Sat Apr 02 2005 Warren Togami <wtogami at redhat.com> 3.0.2-6
+- test svn 3.0 stable r122144 snapshot
+
 * Thu Mar 24 2005 Florian La Roche <laroche at redhat.com>
 - add "exit 0" to postun script

More information about the fedora-cvs-commits mailing list