Hello community, here is the log from the commit of package obs-service-set_version for openSUSE:Factory checked in at 2014-03-14 15:17:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old) and /work/SRC/openSUSE:Factory/.obs-service-set_version.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-set_version" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes 2014-03-07 07:05:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes 2014-03-14 15:17:24.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 7 12:06:41 UTC 2014 - adr...@suse.de + +- Update to version 0.4.0: + + support detection from tar ball content + + use warnings pragma + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.l6alKG/_old 2014-03-14 15:17:24.000000000 +0100 +++ /var/tmp/diff_new_pack.l6alKG/_new 2014-03-14 15:17:24.000000000 +0100 @@ -1,4 +1,4 @@ asd=yxc pkgrel=0 -md5sums=('6adda9a1c5863c49612fc6c81a89c18a') +md5sums=('70c8c0d33e2d47fcb7ad658a231d9f8c') ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.l6alKG/_old 2014-03-14 15:17:24.000000000 +0100 +++ /var/tmp/diff_new_pack.l6alKG/_new 2014-03-14 15:17:24.000000000 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">g...@github.com:openSUSE/obs-service-set_version.git</param> - <param name="changesrevision">10d5bddcea</param> + <param name="changesrevision">48ed90f863</param> </service> </servicedata> \ No newline at end of file ++++++ obs-service-set_version-0.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.4.0/set_version new/obs-service-set_version-0.4.0/set_version --- old/obs-service-set_version-0.4.0/set_version 2014-03-06 12:03:40.000000000 +0100 +++ new/obs-service-set_version-0.4.0/set_version 2014-03-07 13:06:40.000000000 +0100 @@ -19,6 +19,7 @@ my @files; use strict; +use warnings; use Data::Dumper; use File::Basename; @@ -36,6 +37,11 @@ Options: + --version: use given version string, do not detect it from source files + + --basename: detect version based on the file name with a given prefix + + --file: modify only this build description. maybe used multiple times. END ; exit; @@ -86,6 +92,27 @@ } } +# Detect version based tar'd directory name +unless ($version) { + my @binsufs = qw{tar tar.gz tgz tar.bz2 tbz2 tar.xz zip}; + my $binsufsre = join('|', map {"\Q$_\E"} @binsufs); + for my $name (@srcfiles) { + if ($name =~ /$binsufsre$/) { + open( FH, "tar tf $name |" ); + my $line; + while (defined($line = <FH>)) { + if ($line =~ /$basename.*[-_]([\d][^\/]*)\/.*/) { + $version=$1; + last; + } + } + close( FH ); + + last if $version; + } + } +} + # to replace tags in .spec and .dsc files sub replace_tag { my ($filename, $tag, $string) = @_; @@ -119,6 +146,8 @@ rename("$outdir/.$filename", "$outdir/$filename") || die("rename failed"); } +die("No version found or defined") unless $version; + # handle rpm spec and debian dsc files @files = grep {$_ =~ /.(spec|dsc)$/} @srcfiles if @files <= 0; for my $file (@files) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org