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 - [email protected]
+
+- 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.000000000 +0100
+++ new/linuxrc-devtools-0.19/VERSION 2020-07-16 13:03:11.000000000 +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.000000000 +0100
+++ new/linuxrc-devtools-0.19/build_it 2020-07-16 13:03:11.000000000 +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.000000000 +0100
+++ new/linuxrc-devtools-0.19/changelog 2020-07-16 13:03:11.000000000 +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.000000000 +0100
+++ new/linuxrc-devtools-0.19/tobs 2020-07-16 13:03:11.000000000 +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 file.
--spec FILE Use FILE as spec file template instead of the spec
file from
the build service project.
+ --obs DIR Commit everything in DIR to OBS. Note that
*.changes is still
+ automatically created.
--try Don\'t actually do anything.
--test Submit to test project. A test project is an
alternative
project defined in .tobsrc. Sources are taken from
the regular
