Hello community, here is the log from the commit of package mkdud for openSUSE:Factory checked in at 2017-05-09 18:04:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkdud (Old) and /work/SRC/openSUSE:Factory/.mkdud.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkdud" Tue May 9 18:04:08 2017 rev:18 rq:493466 version:1.30 Changes: -------- --- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2017-01-15 11:20:21.475029030 +0100 +++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2017-05-09 18:04:14.495636949 +0200 @@ -0,0 +1,8 @@ +-------------------------------------------------------------------- +Mon May 8 15:02:59 UTC 2017 - [email protected] + +- merge gh#openSUSE/mkdud#10 +- support openSUSE Kubic +- fix service pack condition check +- 1.30 + Old: ---- mkdud-1.29.tar.xz New: ---- mkdud-1.30.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkdud.spec ++++++ --- /var/tmp/diff_new_pack.jeO3dn/_old 2017-05-09 18:04:16.271386015 +0200 +++ /var/tmp/diff_new_pack.jeO3dn/_new 2017-05-09 18:04:16.275385451 +0200 @@ -23,7 +23,7 @@ Summary: Create driver update from rpms License: GPL-3.0+ Group: Hardware/Other -Version: 1.29 +Version: 1.30 Release: 0 Source: %{name}-%{version}.tar.xz Url: https://github.com/wfeldt/mkdud ++++++ mkdud-1.29.tar.xz -> mkdud-1.30.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkdud-1.29/VERSION new/mkdud-1.30/VERSION --- old/mkdud-1.29/VERSION 2017-01-13 16:14:25.000000000 +0100 +++ new/mkdud-1.30/VERSION 2017-05-08 17:02:59.000000000 +0200 @@ -1 +1 @@ -1.29 +1.30 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkdud-1.29/changelog new/mkdud-1.30/changelog --- old/mkdud-1.29/changelog 2017-01-13 16:14:25.000000000 +0100 +++ new/mkdud-1.30/changelog 2017-05-08 17:02:59.000000000 +0200 @@ -1,3 +1,8 @@ +2017-05-05: 1.30 + - merge pr gh#openSUSE/mkdud#10 + - fix service pack condition check + - support openSUSE Kubic + 2017-01-13: 1.29 - merge pr gh#openSUSE/mkdud#9 - follow casp -> caasp renaming diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkdud-1.29/mkdud new/mkdud-1.30/mkdud --- old/mkdud-1.29/mkdud 2017-01-13 16:14:25.000000000 +0100 +++ new/mkdud-1.30/mkdud 2017-05-08 17:02:59.000000000 +0200 @@ -289,7 +289,7 @@ @dists = sort keys %d; for (@dists) { - if(!/^((leap|casp|caasp)?\d+\.\d+|tw|sle[sd]\d+)$/) { + if(!/^((leap|kubic|casp|caasp)?\d+\.\d+|tw|sle[sd]\d+)$/) { if($opt_force) { print STDERR "Warning: using unsupported dist \"$_\"\n"; } @@ -382,8 +382,9 @@ find a hint in SOURCES either, an update for all supported architectures is created. -d, --dist DIST Specify the product the DUD is for. Possible values include: - 13.2, sle12, leap42.2, caasp1.0, tw standing for openSUSE 13.2, - SLE12, Leap 42.2, CAASP 1.0, Tumbleweed, respectively. + 13.2, sle12, leap42.3, kubic1.0, caasp1.0, tw standing for + openSUSE 13.2, SLE12, Leap 42.3, Kubic 1.0, CAASP 1.0, + Tumbleweed, respectively. Note that 'sle12' is a short hand for specifying both 'sles12' and 'sled12'. Note also that there are no separate names for service packs. @@ -522,7 +523,8 @@ The --dist option accepts these values (case-insensitive; X, Y: decimal numbers): - X.Y (e.g. 13.2) = openSUSE X.Y - - leapX.Y (e.g. leap42.2) = openSUSE Leap X.Y + - leapX.Y (e.g. leap42.3) = openSUSE Leap X.Y + - kubicX.Y (e.g. kubic1.0) = openSUSE Kubic X.Y - tw = openSUSE Tumbleweed - sleX (e.g. sle12) = SUSE Linux Enterprise (Server + Desktop) X - slesX (e.g. sles12) = SUSE Linux Enterprise Server X @@ -1758,7 +1760,7 @@ my %p1; for (@$l) { - if(/^(\S+)-(sle([sd])(\d+)|(leap|casp|caasp)?(\d+\.\d+)|tw)$/) { + if(/^(\S+)-(sle([sd])(\d+)|(leap|kubic|casp|caasp)?(\d+\.\d+)|tw)$/) { if($3 eq 's') { push @{$p1{"SLES $4"}}, $1; } @@ -1768,6 +1770,9 @@ elsif($5 eq 'leap') { push @{$p1{"openSUSE Leap $6"}}, $1; } + elsif($5 eq 'kubic') { + push @{$p1{"openSUSE Kubic $6"}}, $1; + } elsif($5 eq 'casp') { push @{$p1{"CASP $6"}}, $1; } @@ -2130,7 +2135,7 @@ my ($dist_name, $dist_ver, $dist_ver_sp, $dist_version_var); - if($dist =~ /^(sle.*?|leap|casp|caasp)(\d+)$/) { + if($dist =~ /^(sle.*?)(\d+)$/) { $dist_name = $1; $dist_ver_sp = $dist_ver = $2; $dist_version_var = 'VERSION'; @@ -2147,12 +2152,15 @@ return ""; } } - else { + elsif($dist =~ /^(leap|kubic|casp|caasp)(\d.*)$/) { $dist_name = ""; - $dist_ver_sp = $dist_ver = $dist; + $dist_ver_sp = $dist_ver = $2; $dist_version_var = 'VERSION_ID'; $dist_ver_sp .= ".$sp" if $sp; } + else { + die "error: can't generate service pack check for dist \"$dist\"\n"; + } # do we have to go via linuxrc version...?
