This script transforms one or more patch/* branches into

[rsync/rsync.git] / packaging / release-rsync

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 9538fea..89b2702 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -16,9 +16,9 @@ my $dest = $ENV{HOME} . '/samba-rsync-ftp';
 my $releasedir = $ENV{HOME} . '/release';
 my $cvsroot = $ENV{CVSROOT} = 'samba.org:/data/cvs';
 
+my $cl_today = time2str('* %a %b %d %Y', time);
 my $ztoday = time2str('%d %b %Y', time);
-my $today = $ztoday;
-$today =~ s/^0//;
+(my $today = $ztoday) =~ s/^0//;
 
 my $break = <<EOT;
 ==========================================================================
@@ -67,7 +67,7 @@ while (<CVS>) {
 chdir('rsync') or die $!;
 
 my($version, $lastversion);
-open(IN, 'configure.in') or die $!;
+open(IN, '<', 'configure.in') or die $!;
 while (<IN>) {
     if (/^RSYNC_VERSION=(.*)/) {
        $version = $lastversion = $1;
@@ -76,15 +76,11 @@ while (<IN>) {
 }
 close IN;
 
-if (my($major, $minor, $rel) = $lastversion =~ /(\d+)\.(\d+)\.(\d+)cvs$/) {
-    if (--$rel < 0) {
-       $rel = 9;
-       if (--$minor < 0) {
-           $minor = 6;
-           $major--;
-       }
-    }
-    $lastversion = "$major.$minor.$rel";
+if ($lastversion =~ /cvs$/) {
+    open(IN, '<', 'OLDNEWS') or die $!;
+    $_ = <IN>;
+    close IN;
+    ($lastversion) = /(\d+\.\d+\.\d+)/;
 }
 
 $version =~ s/cvs/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e;
@@ -170,6 +166,8 @@ foreach my $fn (@tweak_files) {
     } elsif ($fn =~ /\.spec/) {
        s/^(Version:) .*/$1 $version/m;
        s/^(Release:) .*/$1 $release/m;
+       s/^(Released) .*/$1 $version./m;
+       s/^\* \w\w\w \w\w\w \d\d \d\d\d\d (.*)/$cl_today $1/m;
     } elsif ($fn =~ /\.yo/) {
        s/^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)/$1$today$2/m;
        s/^(This man ?page is current for version) \S+ (of rsync)/$1 $version $2/m;