commit linuxrc-devtools for openSUSE:Factory

2020-07-16 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2020-07-16 14:00:22

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new.3592 (New)


Package is "linuxrc-devtools"

Thu Jul 16 14:00:22 2020 rev:12 rq:821281 version:0.19

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2020-03-25 23:50:12.928021852 +0100
+++ 
/work/SRC/openSUSE:Factory/.linuxrc-devtools.new.3592/linuxrc-devtools.changes  
2020-07-16 14:00:32.125412476 +0200
@@ -1,0 +2,8 @@
+Thu Jul 16 11:03:11 UTC 2020 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#25
+- add --obs option to manage files needed or OBS
+- adjust build_it script
+- 0.19
+
+

Old:

  linuxrc-devtools-0.18.tar.xz

New:

  linuxrc-devtools-0.19.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.1JKs1m/_old  2020-07-16 14:00:35.549416300 +0200
+++ /var/tmp/diff_new_pack.1JKs1m/_new  2020-07-16 14:00:35.549416300 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.18
+Version:0.19
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.18.tar.xz -> linuxrc-devtools-0.19.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.18/VERSION 
new/linuxrc-devtools-0.19/VERSION
--- old/linuxrc-devtools-0.18/VERSION   2020-03-25 17:27:12.0 +0100
+++ new/linuxrc-devtools-0.19/VERSION   2020-07-16 13:03:11.0 +0200
@@ -1 +1 @@
-0.18
+0.19
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.18/build_it 
new/linuxrc-devtools-0.19/build_it
--- old/linuxrc-devtools-0.18/build_it  2020-03-25 17:27:12.0 +0100
+++ new/linuxrc-devtools-0.19/build_it  2020-07-16 13:03:11.0 +0200
@@ -33,6 +33,13 @@
 continue
   fi
 
+  if [ "$1" = "--obs" ] ; then
+obs_opt="--obs $2"
+shift
+shift
+continue
+  fi
+
   break
 done
 
@@ -60,7 +67,7 @@
   $prepare
 fi
 
-tobs $spec_opt $dist
+tobs $spec_opt $obs_opt $dist
 
 if [ -z "$prepare" ] ; then
   make $clean_target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.18/changelog 
new/linuxrc-devtools-0.19/changelog
--- old/linuxrc-devtools-0.18/changelog 2020-03-25 17:27:12.0 +0100
+++ new/linuxrc-devtools-0.19/changelog 2020-07-16 13:03:11.0 +0200
@@ -1,3 +1,8 @@
+2020-07-16:0.19
+   - merge gh#openSUSE/linuxrc-devtools#25
+   - add --obs option to manage files needed or OBS
+   - adjust build_it script
+
 2020-03-25:0.18
- merge gh#openSUSE/linuxrc-devtools#24
- get version numbering right when starting a new numbering scheme
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.18/tobs 
new/linuxrc-devtools-0.19/tobs
--- old/linuxrc-devtools-0.18/tobs  2020-03-25 17:27:12.0 +0100
+++ new/linuxrc-devtools-0.19/tobs  2020-07-16 13:03:11.0 +0200
@@ -150,6 +150,7 @@
 my $opt_target;
 my $opt_package;
 my $opt_spec;
+my $opt_obs;
 
 GetOptions(
   'sr'  => \$opt_sr,
@@ -160,6 +161,7 @@
   'target=s'=> \$opt_target,
   'package=s'   => \$opt_package,
   'spec=s'  => \$opt_spec,
+  'obs=s'   => \$opt_obs,
   'save-temp'   => \$opt_save_temp,
   'version' => sub { print "$VERSION\n"; exit 0 },
   'help'=> sub { usage 0 },
@@ -207,6 +209,7 @@
 print "  Version: $config->{version}\n";
 print "   GIT Branch: $config->{branch}\n";
 print "Spec File: $opt_spec\n" if $opt_spec;
+print "  OBS Sources: $opt_obs\n" if $opt_obs;
 print " Dist: $config->{dist}\n";
 print "  Project: $config->{prj}\n";
 print " Test Project: $config->{test}\n" if $config->{test};
@@ -239,6 +242,15 @@
 close $f;
   }
 }
+elsif($opt_obs) {
+  if(open my $f, "$opt_obs/$config->{spec_name}.spec") {
+$config->{spec_file_alt} = [ <$f> ];
+close $f;
+  }
+  else {
+die "spec file missing: $opt_obs/$config->{spec_name}.spec\n";
+  }
+}
 
 if(open my $f, "$tmpdir/$config->{package}/$config->{spec_name}.spec") {
   $config->{spec_file} = [ <$f> ];
@@ -254,6 +266,11 @@
 
 die "missing changes\n" if !defined $config->{changes};
 
+# copy OBS files
+if($opt_obs) {
+  system "cp $opt_obs/* $tmpdir/$config->{package}/"
+}
+
 update_spec;
 
 # write new spec file
@@ -333,6 +350,8 @@
   --target TARGET   Choose config from section TARGET in config

commit linuxrc-devtools for openSUSE:Factory

2020-03-25 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2020-03-25 23:48:28

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new.3160 (New)


Package is "linuxrc-devtools"

Wed Mar 25 23:48:28 2020 rev:11 rq:788272 version:0.18

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2019-09-10 00:01:54.929213828 +0200
+++ 
/work/SRC/openSUSE:Factory/.linuxrc-devtools.new.3160/linuxrc-devtools.changes  
2020-03-25 23:50:12.928021852 +0100
@@ -1,0 +2,8 @@
+Wed Mar 25 16:27:12 UTC 2020 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#24
+- get version numbering right when starting a new numbering scheme
+- minor doc change
+- 0.18
+
+

Old:

  linuxrc-devtools-0.17.tar.xz

New:

  linuxrc-devtools-0.18.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.JvFMZ0/_old  2020-03-25 23:50:14.904021329 +0100
+++ /var/tmp/diff_new_pack.JvFMZ0/_new  2020-03-25 23:50:14.908021328 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package linuxrc-devtools
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.17
+Version:0.18
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.17.tar.xz -> linuxrc-devtools-0.18.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.17/VERSION 
new/linuxrc-devtools-0.18/VERSION
--- old/linuxrc-devtools-0.17/VERSION   2019-09-09 15:11:58.0 +0200
+++ new/linuxrc-devtools-0.18/VERSION   2020-03-25 17:27:12.0 +0100
@@ -1 +1 @@
-0.17
+0.18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.17/changelog 
new/linuxrc-devtools-0.18/changelog
--- old/linuxrc-devtools-0.17/changelog 2019-09-09 15:11:58.0 +0200
+++ new/linuxrc-devtools-0.18/changelog 2020-03-25 17:27:12.0 +0100
@@ -1,3 +1,8 @@
+2020-03-25:0.18
+   - merge gh#openSUSE/linuxrc-devtools#24
+   - get version numbering right when starting a new numbering scheme
+   - minor doc change
+
 2019-09-09:0.17
- merge gh#openSUSE/linuxrc-devtools#23
- auto-add a bugzilla number to every Weblate commit (bsc#1149754)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.17/git2log 
new/linuxrc-devtools-0.18/git2log
--- old/linuxrc-devtools-0.17/git2log   2019-09-09 15:11:58.0 +0200
+++ new/linuxrc-devtools-0.18/git2log   2020-03-25 17:27:12.0 +0100
@@ -475,6 +475,23 @@
 @t = sort tag_sort @t;
 
 $branch = $t[0]{branch};
+
+# Here's some magic:
+#
+# If a commit is tagged  "FOO-X.Y" *and* "FOO-X.Y.0" assume the user
+# wants to start a new sub-numbering scheme.
+#
+# Use "X.Y" as version but remember to go to "X.Y.1" instead of
+# "X.{Y+1}" when we need to increment the version.
+#
+my $version = $t[0]{version};
+if($version =~ s/\.0$//) {
+  if(grep { $_->{branch} eq $branch && $_->{version} eq $version } @t) {
+$t[0]{new_start} = 1;
+$t[0]{version} = $version;
+  }
+}
+
 $x->{tags} = [ $t[0] ];
 
 # printf "X %s\n", tags_to_str($x->{tags});
@@ -489,6 +506,8 @@
 #
 # Basically, use branch + version from most recent tag and increment version.
 #
+# If the 'new_start' attribute to tag is set, start a new sub-numbering scheme.
+#
 sub add_head_tag
 {
   return if @{$config->{log}} < 2;
@@ -499,6 +518,9 @@
   # the first tagged commit if HEAD isn't tagged
   my $tag = { %{$config->{log}[1]{tags}[0]} };
 
+  # append '.0' to version
+  $tag->{version} .= '.0' if $tag->{new_start};
+
   # increment version
   $tag->{version} =~ s/(\d+)$/$1 + 1/e;

commit linuxrc-devtools for openSUSE:Factory

2019-09-09 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2019-09-10 00:01:50

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new.7948 (New)


Package is "linuxrc-devtools"

Tue Sep 10 00:01:50 2019 rev:10 rq:729468 version:0.17

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2019-06-06 18:19:02.572655798 +0200
+++ 
/work/SRC/openSUSE:Factory/.linuxrc-devtools.new.7948/linuxrc-devtools.changes  
2019-09-10 00:01:54.929213828 +0200
@@ -1,0 +2,7 @@
+Mon Sep 9 13:11:58 UTC 2019 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#23
+- auto-add a bugzilla number to every Weblate commit (bsc#1149754)
+- 0.17
+
+

Old:

  linuxrc-devtools-0.16.tar.xz

New:

  linuxrc-devtools-0.17.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.FFEA9E/_old  2019-09-10 00:01:55.761213773 +0200
+++ /var/tmp/diff_new_pack.FFEA9E/_new  2019-09-10 00:01:55.765213772 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.16
+Version:0.17
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.16.tar.xz -> linuxrc-devtools-0.17.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.16/VERSION 
new/linuxrc-devtools-0.17/VERSION
--- old/linuxrc-devtools-0.16/VERSION   2019-06-06 10:26:54.0 +0200
+++ new/linuxrc-devtools-0.17/VERSION   2019-09-09 15:11:58.0 +0200
@@ -1 +1 @@
-0.16
+0.17
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.16/changelog 
new/linuxrc-devtools-0.17/changelog
--- old/linuxrc-devtools-0.16/changelog 2019-06-06 10:26:54.0 +0200
+++ new/linuxrc-devtools-0.17/changelog 2019-09-09 15:11:58.0 +0200
@@ -1,3 +1,7 @@
+2019-09-09:0.17
+   - merge gh#openSUSE/linuxrc-devtools#23
+   - auto-add a bugzilla number to every Weblate commit (bsc#1149754)
+
 2019-06-06:0.16
- merge gh#openSUSE/linuxrc-devtools#22
- fix handling of spec file with several 'Name' definitions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.16/git2log 
new/linuxrc-devtools-0.17/git2log
--- old/linuxrc-devtools-0.16/git2log   2019-06-06 10:26:54.0 +0200
+++ new/linuxrc-devtools-0.17/git2log   2019-09-09 15:11:58.0 +0200
@@ -33,6 +33,7 @@
 sub format_all_logs;
 sub fix_dates;
 sub add_line_breaks;
+sub add_bugzilla_to_weblate;
 sub format_date_obs;
 sub format_date_iso;
 sub raw_date_to_s;
@@ -62,6 +63,7 @@
 my $opt_join_author = 1;   # join consecutive commit messages as 
long as they are by the same author
 my $opt_keep_date = 1; # don't join consecutive commit 
messages if they have different time stamps
 my $opt_default_email = 'opensuse-packag...@opensuse.org'; # default email 
to use in changelog
+my $opt_weblate = 'bsc#1149754';   # bugzilla ref to use for Weblate 
commits
 
 GetOptions(
   'help'  => sub { usage 0 },
@@ -78,6 +80,7 @@
   'keep-date!'=> \$opt_keep_date,
   'log|changelog' => \$opt_log,
   'default-email=s' => \$opt_default_email,
+  'weblate=s' => \$opt_weblate,
 ) || usage 1;
 
 # ensure we are used correctly
@@ -180,6 +183,7 @@
   --no-keep-date  Join consecutive commits even if dates differ.
   --default-email Use this email in changelog entries if no other suitable 
email could be
   determined (default: opensuse-packaging\@opensuse.org).
+  --weblate STRINGAdd this STRING to every auto-generated Weblate commit.
   --help  Print this help text.
   usage
 
@@ -841,6 +845,16 @@
   }
 
   # step 10
+  # - add bugzilla reference to Weblate commits
+
+  for my $commit (@$commits) {
+next unless $commit->{formatted};
+for (@{$commit->{formatted}}) {
+  $_ = add_bugzilla_to_weblate $_;
+}
+  }
+
+  # step 11
   # - add line breaks
 
   for my $commit (@$commits) {
@@ -850,7 +864,7 @@
 }
   }
 
-  # step 11
+  # step 12
   # - generate final log message
   #
   # note: non-(open)suse email addresses are replaced by $opt_default_email
@@ -936,6 +950,27 @@
 }
 
 
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# new_text = add_bugzilla_to_weblate(text)
+#
+# Add bugzilla number to an auto-generated Weblate commit.
+# - text: some text
+# - new_text: same text, "($opt_weblate)" added
+#
+sub

commit linuxrc-devtools for openSUSE:Factory

2019-06-06 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2019-06-06 18:19:00

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new.4811 (New)


Package is "linuxrc-devtools"

Thu Jun  6 18:19:00 2019 rev:9 rq:708041 version:0.16

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2019-05-22 11:15:28.586539933 +0200
+++ 
/work/SRC/openSUSE:Factory/.linuxrc-devtools.new.4811/linuxrc-devtools.changes  
2019-06-06 18:19:02.572655798 +0200
@@ -1,0 +2,7 @@
+Thu Jun 6 08:26:54 UTC 2019 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#22
+- fix handling of spec file with several 'Name' definitions
+- 0.16
+
+

Old:

  linuxrc-devtools-0.15.tar.xz

New:

  linuxrc-devtools-0.16.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.0S4Br2/_old  2019-06-06 18:19:03.296655586 +0200
+++ /var/tmp/diff_new_pack.0S4Br2/_new  2019-06-06 18:19:03.300655585 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.15
+Version:0.16
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.15.tar.xz -> linuxrc-devtools-0.16.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.15/VERSION 
new/linuxrc-devtools-0.16/VERSION
--- old/linuxrc-devtools-0.15/VERSION   2019-01-29 13:22:26.0 +0100
+++ new/linuxrc-devtools-0.16/VERSION   2019-06-06 10:26:54.0 +0200
@@ -1 +1 @@
-0.15
+0.16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.15/changelog 
new/linuxrc-devtools-0.16/changelog
--- old/linuxrc-devtools-0.15/changelog 2019-01-29 13:22:26.0 +0100
+++ new/linuxrc-devtools-0.16/changelog 2019-06-06 10:26:54.0 +0200
@@ -1,3 +1,7 @@
+2019-06-06:0.16
+   - merge gh#openSUSE/linuxrc-devtools#22
+   - fix handling of spec file with several 'Name' definitions
+
 2019-01-29:0.15
- merge gh#openSUSE/linuxrc-devtools#16
- avoid identical timestamps in changelog and make default email
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.15/tobs 
new/linuxrc-devtools-0.16/tobs
--- old/linuxrc-devtools-0.15/tobs  2019-01-29 13:22:26.0 +0100
+++ new/linuxrc-devtools-0.16/tobs  2019-06-06 10:26:54.0 +0200
@@ -534,14 +534,22 @@
 }
 
 if(/^Name:(\s*)(\S+)/) {
-  $spec_name = $2;
+  # Be careful: if there are several 'Name:' lines don't do fancy stuff
+  # as we are not sure which one is correct (think of %if's in the
+  # spec).
+  if(defined $spec_name) {
+$spec_name = '';
+  }
+  else {
+$spec_name = $2;
+  }
 }
 
 if(/^Source:(\s*)((\S+)\.tar\.(bz2|gz|xz))/) {
   $config->{rm_archive} = $2;
   my $s = $1;
   my $n = $config->{archive};
-  $config->{rm_archive} =~ s/%\{name\}/$spec_name/g;
+  $config->{rm_archive} =~ s/%\{name\}/$spec_name/g if $spec_name ne '';
   $config->{rm_archive} =~ s/%\{version\}/$spec_version/g;
   $n =~ s/^$spec_name\-/%\{name\}-/ if $spec_name ne '';
   $n =~ s/\-$config->{version}\.tar/-%\{version\}.tar/ if $spec_version ne 
"";

commit linuxrc-devtools for openSUSE:Factory

2019-05-22 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2019-05-22 11:15:27

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new.5148 (New)


Package is "linuxrc-devtools"

Wed May 22 11:15:27 2019 rev:8 rq:704377 version:0.15

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2018-01-13 21:46:51.660274719 +0100
+++ 
/work/SRC/openSUSE:Factory/.linuxrc-devtools.new.5148/linuxrc-devtools.changes  
2019-05-22 11:15:28.586539933 +0200
@@ -1,0 +2,40 @@
+Tue Jan 29 12:22:26 UTC 2019 - snw...@suse.de
+
+- merge gh#openSUSE/linuxrc-devtools#21
+- add support for jira
+- 0.15
+
+
+Thu Nov 15 15:30:55 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/linuxrc-devtools#20
+- fix typo
+
+
+Fri Oct 12 14:31:04 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/linuxrc-devtools#19
+- remove shortened lines from log (that match the beginning of
+  other lines)
+
+
+Mon Aug 27 13:40:24 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/linuxrc-devtools#18
+- rework log creation to work better with merge commits
+
+
+Mon Aug 6 13:15:04 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/linuxrc-devtools#17
+- ignore tags inside merge commits
+
+
+Thu Apr 19 09:34:10 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/linuxrc-devtools#16
+- avoid identical timestamps in changelog and make default email
+  address configurable
+- fix time updates
+
+

Old:

  linuxrc-devtools-0.14.tar.xz

New:

  linuxrc-devtools-0.15.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.8yu3vE/_old  2019-05-22 11:15:29.298539802 +0200
+++ /var/tmp/diff_new_pack.8yu3vE/_new  2019-05-22 11:15:29.298539802 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package linuxrc-devtools
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.14
+Version:0.15
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.14.tar.xz -> linuxrc-devtools-0.15.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.14/VERSION 
new/linuxrc-devtools-0.15/VERSION
--- old/linuxrc-devtools-0.14/VERSION   2018-01-09 15:58:21.0 +0100
+++ new/linuxrc-devtools-0.15/VERSION   2019-01-29 13:22:26.0 +0100
@@ -1 +1 @@
-0.14
+0.15
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.14/changelog 
new/linuxrc-devtools-0.15/changelog
--- old/linuxrc-devtools-0.14/changelog 2018-01-09 15:58:21.0 +0100
+++ new/linuxrc-devtools-0.15/changelog 2019-01-29 13:22:26.0 +0100
@@ -1,3 +1,20 @@
+2019-01-29:0.15
+   - merge gh#openSUSE/linuxrc-devtools#16
+   - avoid identical timestamps in changelog and make default email
+ address configurable
+   - fix time updates
+   - merge gh#openSUSE/linuxrc-devtools#17
+   - ignore tags inside merge commits
+   - merge gh#openSUSE/linuxrc-devtools#18
+   - rework log creation to work better with merge commits
+   - merge gh#openSUSE/linuxrc-devtools#19
+   - remove shortened lines from log (that match the beginning of
+ other lines)
+   - merge gh#openSUSE/linuxrc-devtools#20
+   - fix typo
+   - merge gh#openSUSE/linuxrc-devtools#21
+   - add support for jira
+
 2018-01-09:0.14
- merge gh#openSUSE/linuxrc-devtools#15
- more complete OBS state check
@@ -30,12 +47,10 @@
- skip *.changes file in 'package' dir
- add --prepare option to build_it script
- add make_package script
+   - enhance submission scripts
 
 2017-08-10:0.8
- merge gh#openSUSE/linuxrc-devtools#8
-   - added --(no-)keep-date options
-
-2017-05-03:0.7
- started rewrite of git2log script
- implement start tag, switch default format to obs
- document git2log
@@ -62,6 +77,8 @@
- avoid empty log

commit linuxrc-devtools for openSUSE:Factory

2018-01-13 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2018-01-13 21:46:32

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new (New)


Package is "linuxrc-devtools"

Sat Jan 13 21:46:32 2018 rev:7 rq:562915 version:0.14

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2017-09-21 12:35:07.756866034 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc-devtools.new/linuxrc-devtools.changes   
2018-01-13 21:46:51.660274719 +0100
@@ -1,0 +2,7 @@
+Tue Jan 9 14:58:21 UTC 2018 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#15
+- more complete OBS state check
+- 0.14
+
+

Old:

  linuxrc-devtools-0.13.tar.xz

New:

  linuxrc-devtools-0.14.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.VleKFB/_old  2018-01-13 21:46:52.228248241 +0100
+++ /var/tmp/diff_new_pack.VleKFB/_new  2018-01-13 21:46:52.232248054 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package linuxrc-devtools
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.13
+Version:0.14
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.13.tar.xz -> linuxrc-devtools-0.14.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.13/VERSION 
new/linuxrc-devtools-0.14/VERSION
--- old/linuxrc-devtools-0.13/VERSION   2017-09-15 08:36:25.0 +0200
+++ new/linuxrc-devtools-0.14/VERSION   2018-01-09 15:58:21.0 +0100
@@ -1 +1 @@
-0.13
+0.14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.13/changelog 
new/linuxrc-devtools-0.14/changelog
--- old/linuxrc-devtools-0.13/changelog 2017-09-15 08:36:25.0 +0200
+++ new/linuxrc-devtools-0.14/changelog 2018-01-09 15:58:21.0 +0100
@@ -1,3 +1,7 @@
+2018-01-09:0.14
+   - merge gh#openSUSE/linuxrc-devtools#15
+   - more complete OBS state check
+
 2017-09-15:0.13
- merge gh#openSUSE/linuxrc-devtools#14
- don't query branch from git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.13/tobs 
new/linuxrc-devtools-0.14/tobs
--- old/linuxrc-devtools-0.13/tobs  2017-09-15 08:36:25.0 +0200
+++ new/linuxrc-devtools-0.14/tobs  2018-01-09 15:58:21.0 +0100
@@ -644,6 +644,17 @@
 
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Wait for OBS build results and submit package if we got a positive result.
+#
+# We loop until we see a positive build result or we're sure the OBS is not
+# building anymore.
+#
+# The package build is considered ok if there's at least a single positive
+# build at this point. If not, it has failed.
+#
+# Note that failed builds do not worry us as many projects are set up to
+# build several targets and not all of them are expected to work.
+#
 sub do_sr
 {
   my $bs = $config->{bs};
@@ -682,6 +693,15 @@
 do {
   sleep $delay;
   if(open my $p, "osc -A https://$bs r --csv $bs_prefix$config->{prj} 
$s[1] |") {
+# sample line:
+#
+# openSUSE_Factory|x86_64|unpublished|False|succeeded|
+#
+# field 0, 1, 2: not relevant
+# field 3: False or True; if True, state is going to change
+# field 4: status
+# field 5: sometimes a 6th field is added with the real state
+#
 while (<$p>) {
   chomp;
   my @i = split /\|/;
@@ -698,12 +718,20 @@
 $i[3] eq "False" &&
 (
   $i[4] eq "failed" ||
+  $i[4] eq "unresolvable" ||
+  $i[4] eq "broken" ||
   $i[4] eq "finished" && $i[5] eq "failed"
 )
   ) {
 $failed = 1;
   }
-  else {
+  elsif(
+$i[3] eq "False" &&
+!(
+  $i[4] eq "excluded" ||
+  $i[4] eq "disabled"
+)
+  ) {
 $building = 1;
   }
 }

commit linuxrc-devtools for openSUSE:Factory

2017-09-21 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2017-09-21 12:35:00

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new (New)


Package is "linuxrc-devtools"

Thu Sep 21 12:35:00 2017 rev:6 rq:527534 version:0.13

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2017-08-18 15:05:49.142196783 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc-devtools.new/linuxrc-devtools.changes   
2017-09-21 12:35:07.756866034 +0200
@@ -1,0 +2,30 @@
+Fri Sep 15 06:36:25 UTC 2017 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#14
+- don't query branch from git
+- 0.13
+
+
+Thu Sep 14 12:26:24 UTC 2017 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#13
+- ensure dates never decrease in changelog
+- 0.12
+
+
+Thu Sep 14 11:50:23 UTC 2017 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#12
+- ensure the newly created changelog is used
+
+
+Tue Sep 12 14:11:19 UTC 2017 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#11
+- default to git project name if no package name is specified
+- install also make_package script
+- add --no-wait option to submit_it script
+- allow to use an alternative spec file
+- 0.11
+
+

Old:

  linuxrc-devtools-0.10.tar.xz

New:

  linuxrc-devtools-0.13.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.INGT8I/_old  2017-09-21 12:35:08.272793431 +0200
+++ /var/tmp/diff_new_pack.INGT8I/_new  2017-09-21 12:35:08.276792868 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.10
+Version:0.13
 Release:0
 Source: %{name}-%{version}.tar.xz
 
@@ -47,6 +47,7 @@
 %{_bindir}/build_it
 %{_bindir}/git2log
 %{_bindir}/git2tags
+%{_bindir}/make_package
 %{_bindir}/submit_it
 %{_bindir}/tobs
 

++ linuxrc-devtools-0.10.tar.xz -> linuxrc-devtools-0.13.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.10/Makefile 
new/linuxrc-devtools-0.13/Makefile
--- old/linuxrc-devtools-0.10/Makefile  2017-08-17 12:55:18.0 +0200
+++ new/linuxrc-devtools-0.13/Makefile  2017-09-15 08:36:25.0 +0200
@@ -1,5 +1,5 @@
 PACKAGE := linuxrc-devtools
-SCRIPTS := build_it git2log git2tags submit_it tobs
+SCRIPTS := build_it git2log git2tags submit_it tobs make_package
 
 GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else 
echo true ; fi)
 GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads 
.git/refs/tags)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.10/VERSION 
new/linuxrc-devtools-0.13/VERSION
--- old/linuxrc-devtools-0.10/VERSION   2017-08-17 12:55:18.0 +0200
+++ new/linuxrc-devtools-0.13/VERSION   2017-09-15 08:36:25.0 +0200
@@ -1 +1 @@
-0.10
+0.13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.10/build_it 
new/linuxrc-devtools-0.13/build_it
--- old/linuxrc-devtools-0.10/build_it  2017-08-17 12:55:18.0 +0200
+++ new/linuxrc-devtools-0.13/build_it  2017-09-15 08:36:25.0 +0200
@@ -26,6 +26,13 @@
 continue
   fi
 
+  if [ "$1" = "--spec" ] ; then
+spec_opt="--spec $2"
+shift
+shift
+continue
+  fi
+
   break
 done
 
@@ -53,7 +60,7 @@
   $prepare
 fi
 
-tobs $dist
+tobs $spec_opt $dist
 
 if [ -z "$prepare" ] ; then
   make $clean_target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.10/changelog 
new/linuxrc-devtools-0.13/changelog
--- old/linuxrc-devtools-0.10/changelog 2017-08-17 12:55:18.0 +0200
+++ new/linuxrc-devtools-0.13/changelog 2017-09-15 08:36:25.0 +0200
@@ -1,3 +1,20 @@
+2017-09-15:0.13
+   - merge gh#openSUSE/linuxrc-devtools#14
+   - don't query branch from git
+
+2017-09-14:0.12
+   - merge gh#openSUSE/linuxrc-devtools#12
+   - ensure the newly created changelog is used
+   - merge gh#openSUSE/linuxrc-devtools#13
+   - ensure dates never decrease in changelog
+
+2017-09-12:0.11
+   - merge gh#openSUSE/linuxrc-devtools#11
+   - default to git project name if no package name is specified
+   - install also make_package script
+   - add --no-wait option to

commit linuxrc-devtools for openSUSE:Factory

2017-08-18 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2017-08-18 15:05:42

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new (New)


Package is "linuxrc-devtools"

Fri Aug 18 15:05:42 2017 rev:5 rq:517366 version:0.10

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2017-08-12 20:27:20.898802467 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc-devtools.new/linuxrc-devtools.changes   
2017-08-18 15:05:49.142196783 +0200
@@ -1,0 +2,18 @@
+Thu Aug 17 10:55:18 UTC 2017 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#10
+- fix typo in make_package
+- 0.10
+
+
+Thu Aug 17 08:19:38 UTC 2017 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc-devtools#9
+- write VERSION file only when really needed
+- update link to home project in git2log
+- skip *.changes file in 'package' dir
+- add --prepare option to build_it script
+- add make_package script
+- 0.9
+
+

Old:

  linuxrc-devtools-0.8.tar.xz

New:

  linuxrc-devtools-0.10.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.UY2eDi/_old  2017-08-18 15:05:49.974079620 +0200
+++ /var/tmp/diff_new_pack.UY2eDi/_new  2017-08-18 15:05:49.978079057 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.8
+Version:0.10
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.8.tar.xz -> linuxrc-devtools-0.10.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.8/VERSION 
new/linuxrc-devtools-0.10/VERSION
--- old/linuxrc-devtools-0.8/VERSION2017-08-10 16:07:39.0 +0200
+++ new/linuxrc-devtools-0.10/VERSION   2017-08-17 12:55:18.0 +0200
@@ -1 +1 @@
-0.8
+0.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.8/build_it 
new/linuxrc-devtools-0.10/build_it
--- old/linuxrc-devtools-0.8/build_it   2017-08-10 16:07:39.0 +0200
+++ new/linuxrc-devtools-0.10/build_it  2017-08-17 12:55:18.0 +0200
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/bash -e
 
 unset LANG
 
@@ -19,6 +19,13 @@
 continue
   fi
 
+  if [ "$1" = "--prepare" ] ; then
+prepare="$2"
+shift
+shift
+continue
+  fi
+
   break
 done
 
@@ -26,22 +33,28 @@
   branch=$1
 fi
 
-clean_target=clean
-grep -q -s distclean: Makefile* && clean_target=distclean
-
 git status
 git checkout $branch
 git pull
 
-make $clean_target
+if [ -z "$prepare" ] ; then
+  clean_target=clean
+  grep -q -s distclean: Makefile* && clean_target=distclean
+
+  make $clean_target
+
+  if [ -d package ] ; then
+echo 'old archive files found!'
+exit 1
+  fi
 
-if [ -d package ] ; then
-  echo 'old archive files found!'
-  exit 1
+  make archive
+else
+  $prepare
 fi
 
-make archive
-
 tobs $dist
 
-make $clean_target
+if [ -z "$prepare" ] ; then
+  make $clean_target
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.8/changelog 
new/linuxrc-devtools-0.10/changelog
--- old/linuxrc-devtools-0.8/changelog  2017-08-10 16:07:39.0 +0200
+++ new/linuxrc-devtools-0.10/changelog 2017-08-17 12:55:18.0 +0200
@@ -1,3 +1,15 @@
+2017-08-17:0.10
+   - merge gh#openSUSE/linuxrc-devtools#10
+   - fix typo in make_package
+
+2017-08-17:0.9
+   - merge gh#openSUSE/linuxrc-devtools#9
+   - write VERSION file only when really needed
+   - update link to home project in git2log
+   - skip *.changes file in 'package' dir
+   - add --prepare option to build_it script
+   - add make_package script
+
 2017-08-10:0.8
- merge gh#openSUSE/linuxrc-devtools#8
- added --(no-)keep-date options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.8/git2log 
new/linuxrc-devtools-0.10/git2log
--- old/linuxrc-devtools-0.8/git2log2017-08-10 16:07:39.0 +0200
+++ new/linuxrc-devtools-0.10/git2log   2017-08-17 12:55:18.0 +0200
@@ -2,7 +2,7 @@
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #
-# This script is maintained at https://github.com/openSUSE/ssob
+# This script is maintained at https://github.com/openSUSE/linuxrc-devtools
 #
 # If you're in another project, this is just a copy.
 # You may update it to the latest version from time to time...
@@ -108,9 +108,18 @@
 
 # just

commit linuxrc-devtools for openSUSE:Factory

2017-08-12 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2017-08-12 20:27:20

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new (New)


Package is "linuxrc-devtools"

Sat Aug 12 20:27:20 2017 rev:4 rq:515931 version:0.8

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2017-08-10 14:13:20.669966671 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc-devtools.new/linuxrc-devtools.changes   
2017-08-12 20:27:20.898802467 +0200
@@ -1,0 +2,6 @@
+Thu Aug 10 12:12:32 UTC 2017 - wfe...@opensuse.org
+
+- added --(no-)keep-date options
+- 0.8
+
+

Old:

  linuxrc-devtools-0.7.tar.xz

New:

  linuxrc-devtools-0.8.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.mAnXcX/_old  2017-08-12 20:27:21.714688130 +0200
+++ /var/tmp/diff_new_pack.mAnXcX/_new  2017-08-12 20:27:21.722687009 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.7
+Version:0.8
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.7.tar.xz -> linuxrc-devtools-0.8.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.7/VERSION 
new/linuxrc-devtools-0.8/VERSION
--- old/linuxrc-devtools-0.7/VERSION2017-05-03 14:16:02.0 +0200
+++ new/linuxrc-devtools-0.8/VERSION2017-08-10 16:07:39.0 +0200
@@ -1 +1 @@
-0.7
+0.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.7/changelog 
new/linuxrc-devtools-0.8/changelog
--- old/linuxrc-devtools-0.7/changelog  2017-05-03 14:16:02.0 +0200
+++ new/linuxrc-devtools-0.8/changelog  2017-08-10 16:07:39.0 +0200
@@ -1,3 +1,7 @@
+2017-08-10:0.8
+   - merge gh#openSUSE/linuxrc-devtools#8
+   - added --(no-)keep-date options
+
 2017-05-03:0.7
- started rewrite of git2log script
- implement start tag, switch default format to obs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.7/git2log 
new/linuxrc-devtools-0.8/git2log
--- old/linuxrc-devtools-0.7/git2log2017-05-03 14:16:02.0 +0200
+++ new/linuxrc-devtools-0.8/git2log2017-08-10 16:07:39.0 +0200
@@ -59,6 +59,7 @@
 my $opt_format = 'internal';   # obs, internal
 my $opt_merge_msg_before = 1;  # log auto generated pr merge message 
before the commit messages (vs. after)
 my $opt_join_author = 1;   # join consecutive commit messages as 
long as they are by the same author
+my $opt_keep_date = 1; # don't join consecutive commit 
messages if they have different time stamps
 
 GetOptions(
   'help'  => sub { usage 0 },
@@ -72,6 +73,7 @@
   'fuzz=i'=> \$opt_width_fuzz,
   'merge-msg=s'   => sub { $opt_merge_msg_before = ($_[1] eq 'after' ? 0 : 1) 
},
   'join-author!'  => \$opt_join_author,
+  'keep-date!'=> \$opt_keep_date,
   'log|changelog' => \$opt_log,
 ) || usage 1;
 
@@ -161,6 +163,8 @@
   Valid values for WHERE are 'after' and 'before' 
(default).
   --join-author   Join consecutive commits as long as they are by the same 
author. (default)
   --no-join-authorKeep consecutive commits by the same author separate.
+  --keep-date Join consecutive commits only if they have the same 
date. (default)
+  --no-keep-date  Join consecutive commits even if dates differ.
   --help  Print this help text.
   usage
 
@@ -706,7 +710,7 @@
   }
 
   # step 6
-  # - join commit messages with same author (# & date)
+  # - join commit messages with same author (optionally even with different 
dates)
 
   my $commit0;
 
@@ -718,7 +722,7 @@
   # $commit->{merge_ref} eq $commit0->{merge_ref} &&
   (
 $opt_join_author && ($commit->{author} eq $commit0->{author})
-# && $commit->{date} eq $commit0->{date}
+&& (!$opt_keep_date || $commit->{date} eq $commit0->{date})
   )
   || $opt_format eq 'internal'
 ) {

commit linuxrc-devtools for openSUSE:Factory

2017-08-10 Thread root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2017-08-10 14:05:53

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new (New)


Package is "linuxrc-devtools"

Thu Aug 10 14:05:53 2017 rev:3 rq:515159 version:0.7

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2016-11-24 21:25:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.linuxrc-devtools.new/linuxrc-devtools.changes   
2017-08-10 14:13:20.669966671 +0200
@@ -0,0 +1,31 @@
+
+Wed May 3 12:16:02 UTC 2017 - wfe...@opensuse.org
+
+- started rewrite of git2log script
+- implement start tag, switch default format to obs
+- document git2log
+- minor doc update
+- fix typo
+- another doc update
+- adjust 'internal' changelog format to match the old format
+- fix version auto-increment
+- update tobs to use the new git2log to handle changelog
+- use installed git2log script
+- git2log: if start tag is specified, make sure it exists
+- treat commits ahead of most recent tag as belonging together
+- join successive commits of the same author
+- add comments to git2log
+- add --package option to tobs
+- allow --target as alias to --dist and support --package option
+- build_it: support alternative --branch option
+- submit_it doesn't need git repo to work
+- allow options in any order in build_it and submit_it
+- no need to check JOB_NAME in submit_it
+- tobs: allow submit request across different build services
+- modify default PATH to include $HOME/bin
+- show merge message at correct place
+- avoid empty log message when version info is missing
+- add --(no-)join-author option
+- added '@-log@' tag (delete commit message)
+- 0.7
+

Old:

  linuxrc-devtools-0.6.tar.xz

New:

  linuxrc-devtools-0.7.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.Ovhaqw/_old  2017-08-10 14:13:21.261883328 +0200
+++ /var/tmp/diff_new_pack.Ovhaqw/_new  2017-08-10 14:13:21.261883328 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package linuxrc-devtools
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.6
+Version:0.7
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.6.tar.xz -> linuxrc-devtools-0.7.tar.xz ++
 1711 lines of diff (skipped)

commit linuxrc-devtools for openSUSE:Factory

2016-11-24 Thread h_root 
Hello community,

here is the log from the commit of package linuxrc-devtools for 
openSUSE:Factory checked in at 2016-11-24 21:25:13

Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
 and  /work/SRC/openSUSE:Factory/.linuxrc-devtools.new (New)


Package is "linuxrc-devtools"

Changes:

--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2015-10-08 08:25:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc-devtools.new/linuxrc-devtools.changes   
2016-11-24 21:25:14.0 +0100
@@ -1,0 +2,7 @@
+Wed Nov 23 14:18:56 UTC 2016 - snw...@suse.com
+
+- merge pr gh#openSUSE/linuxrc-devtools#7
+- auto-add github pull request tag to changelog
+- 0.6
+
+---

Old:

  linuxrc-devtools-0.5.tar.xz

New:

  linuxrc-devtools-0.6.tar.xz



Other differences:
--
++ linuxrc-devtools.spec ++
--- /var/tmp/diff_new_pack.dllqIV/_old  2016-11-24 21:25:15.0 +0100
+++ /var/tmp/diff_new_pack.dllqIV/_new  2016-11-24 21:25:15.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package linuxrc-devtools
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   linuxrc-devtools
-Version:0.5
+Version:0.6
 Release:0
 Source: %{name}-%{version}.tar.xz
 

++ linuxrc-devtools-0.5.tar.xz -> linuxrc-devtools-0.6.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.5/VERSION 
new/linuxrc-devtools-0.6/VERSION
--- old/linuxrc-devtools-0.5/VERSION2015-09-29 12:59:40.0 +0200
+++ new/linuxrc-devtools-0.6/VERSION2016-11-23 15:15:59.0 +0100
@@ -1 +1 @@
-0.5
+0.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.5/changelog 
new/linuxrc-devtools-0.6/changelog
--- old/linuxrc-devtools-0.5/changelog  2015-09-29 12:59:40.0 +0200
+++ new/linuxrc-devtools-0.6/changelog  2016-11-23 15:15:59.0 +0100
@@ -1,12 +1,22 @@
+2016-11-23:0.6
+   - merge pr gh#openSUSE/linuxrc-devtools#7
+   - auto-add github pull request tag to changelog
+
 2015-09-29:0.5
+   - merge pr gh#openSUSE/linuxrc-devtools#6
- 'make clean' deletes *~ files and package/ directory
 
 2015-09-29:0.4
+   - merge pr gh#openSUSE/linuxrc-devtools#5
- Add information about linuxrc-devtools OBS project
 
 2015-09-28:0.3
+   - merge pr gh#openSUSE/linuxrc-devtools#4
- Add documentation about submission to OBS (through Jenkins)
+   - merge pr gh#openSUSE/linuxrc-devtools#3
- adjust submit script to deal with obs not accepting empty requests
+   - merge pr gh#openSUSE/linuxrc-devtools#2
+   - merge pr gh#openSUSE/linuxrc-devtools#1
- Convert README to markdown
- Escaped a quote to fix Emacs highlighting.
- A Makefile for making an RPM of this.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-devtools-0.5/git2log 
new/linuxrc-devtools-0.6/git2log
--- old/linuxrc-devtools-0.5/git2log2015-09-29 12:59:40.0 +0200
+++ new/linuxrc-devtools-0.6/git2log2016-11-23 15:15:59.0 +0100
@@ -31,6 +31,7 @@
 
 my $branch;
 my $current_version;
+my $github_project;
 my @tags;
 my @all_tags;
 
@@ -65,6 +66,10 @@
   exit 0 if $ok;
 }
 
+if(`git config remote.origin.url` =~ m#github.com[:/]+(\S+/\S+)#) {
+  $github_project = $1;
+}
+
 @all_tags = `git tag`;
 chomp @all_tags;
 
@@ -156,6 +161,9 @@
 $merge = 1 if /^Merge: /;
 $merge = 0 if /^commit /;
 push @t2, $_ if !$merge;
+if(/^Merge pull request #(\d+) from /) {
+  push @t2, "merge pr gh#$github_project#$1\n" if $github_project;
+}
   }
   @t = @t2;