cygport/log4cplus.cygport: Update for 1.2.0-RC1.

scripts/propagate-version.pl: Update to propagate version and SO version into Cygport.

Author: wilx

cygport/log4cplus.cygport

@@ -1,3 +1,6 @@
+NAME=log4cplus
+VERSION=1.2.0-rc1
+RELEASE=1
 CATEGORY="Libs"
 SUMMARY="C++ logging library"
 DESCRIPTION="log4cplus is a simple to use C++ logging API providing thread-safe,
@@ -9,12 +12,12 @@ SRC_URI="mirror://sourceforge/log4cplus/log4cplus-stable/${PV%-rc*}/${P}.tar.xz"
 PATCH_URI="configure.ac-relax-libtool-version.patch
            configure.ac-disable-__thread-keyword.patch"
 
-PKG_NAMES="lib${PN}1.1_5 lib${PN}qt4debugappender1.1_5
+PKG_NAMES="lib${PN}1.2_2 lib${PN}qt4debugappender1.2_2
            lib${PN}-devel lib${PN}qt4debugappender-devel"
-liblog4cplus1_1_5_SUMMARY="${SUMMARY} (runtime)"
-liblog4cplus1_1_5_CONTENTS="usr/bin/cyglog4cplus-1-1-5.dll"
-liblog4cplusqt4debugappender1_1_5_SUMMARY="${SUMMARY} (Qt4 runtime)"
-liblog4cplusqt4debugappender1_1_5_CONTENTS="usr/bin/cyglog4cplusqt4*-1-1-5.dll"
+liblog4cplus1_2_2_SUMMARY="${SUMMARY} (runtime)"
+liblog4cplus1_2_2_CONTENTS="usr/bin/cyglog4cplus-1-2-2.dll"
+liblog4cplusqt4debugappender1_2_2_SUMMARY="${SUMMARY} (Qt4 runtime)"
+liblog4cplusqt4debugappender1_2_2_CONTENTS="usr/bin/cyglog4cplusqt4*-1-2-2.dll"
 liblog4cplus_devel_SUMMARY="${SUMMARY} (development)"
 liblog4cplus_devel_CONTENTS="--exclude=*qt4* usr/include/ usr/lib/ usr/share/doc/"
 liblog4cplusqt4debugappender_devel_SUMMARY="${SUMMARY} (Qt4 development)"

scripts/propagate-version.pl

@@ -28,6 +28,28 @@ BEGIN
     }
 }
 
+close $fh;
+
+# parse SO version from configure.ac
+
+open (my $fh2, "<", "configure.ac")
+    or die $!;
+
+my ($so_current, $so_revision, $so_age);
+while (my $line = <$fh2>)
+{
+    if ($line =~ m/\s* LT_VERSION= \s*
+          (\d+) \s* : \s* (\d+) \s* : \s* (\d+) \s*/x)
+    {
+        ($so_current, $so_revision, $so_age) = ($1, $2, $3);
+        print +("SO version: ", $so_current, ".", $so_revision, ".", $so_age,
+                "\n");
+        last;
+    }
+}
+
+close $fh2;
+
 # edit configure.ac
 
 {
@@ -63,15 +85,13 @@ BEGIN
         $line =~ s/(Release: \s*)(.*)/${1}1/x;
         print $line;
     }
-}
 
-my @cygport = <cygport/*.cygport>;
-die "cannot cope with multiple Cygport files" if (@cygport > 1);
-my $cygport = @cygport[0];
-my $new_cygport = "cygport/log4cplus-$version-1.cygport";
-if ($cygport ne $new_cygport)
-{
-    system("bzr mv \"$cygport\" \"$new_cygport\"") == 0
-        or die "bzr mv on $cygport has failed: $?";
+    local @ARGV = ("cygport/log4cplus.cygport");
+    while (my $line = <>)
+    {
+        $line =~ s/(\s* VERSION \s* = \s*)(\d+\.\d+\.\d+)(-.+)?/$1$version$3/x
+            || $line =~ s/\d+ ([._\-]) \d+ ([._\-]) \d+
+                         /$major$1$minor$2$so_current/gx;
+        print $line;
+    }    
 }
-