--- embedaddon/rsync/packaging/release-rsync 2012/02/17 15:09:30 1.1 +++ embedaddon/rsync/packaging/release-rsync 2016/11/01 09:54:32 1.1.1.3 @@ -67,13 +67,13 @@ check_git_state($master_branch, 1, 1); my $confversion; open(IN, '<', 'configure.ac') or die $!; while () { - if (/^RSYNC_VERSION=(.*)/) { + if (/^AC_INIT\(\[rsync\],\s*\[(\d.+?)\]/) { $confversion = $1; last; } } close IN; -die "Unable to find RSYNC_VERSION in configure.ac\n" unless defined $confversion; +die "Unable to find AC_INIT with version in configure.ac\n" unless defined $confversion; open(IN, '<', 'OLDNEWS') or die $!; $_ = ; @@ -202,8 +202,8 @@ foreach my $fn (@tweak_files) { undef $/; $_ = ; $/ = "\n"; close IN; if ($fn =~ /configure/) { - s/^RSYNC_VERSION=.*/RSYNC_VERSION=$version/m - or die "Unable to update RSYNC_VERSION in $fn\n"; + s/^(AC_INIT\(\[rsync\],\s*\[)\d.+?(\])/$1$version$2/m + or die "Unable to update AC_INIT with version in $fn\n"; } elsif ($fn =~ /\.spec/) { while (my($str, $val) = each %specvars) { s/^\Q$str\E .*/$str $val/m @@ -278,7 +278,7 @@ system "packaging/patch-update --branch=$master_branch if ($ans =~ /^y/i) { print "\nVisiting all \"patch/$master_branch/*\" branches ...\n"; - system "packaging/patch-update --branch=$master_branch --shell"; + system "packaging/patch-update --branch=$master_branch --skip-check --shell"; } if (-d 'patches/.git') {