Hello community,
here is the log from the commit of package patterns-devel-base for
openSUSE:Factory checked in at 2018-08-02 14:54:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/patterns-devel-base (Old)
and /work/SRC/openSUSE:Factory/.patterns-devel-base.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patterns-devel-base"
Thu Aug 2 14:54:46 2018 rev:6 rq:626416 version:20170319
Changes:
--------
--- /work/SRC/openSUSE:Factory/patterns-devel-base/patterns-devel-base.changes
2018-07-27 10:52:33.841224090 +0200
+++
/work/SRC/openSUSE:Factory/.patterns-devel-base.new/patterns-devel-base.changes
2018-08-02 14:54:54.163951558 +0200
@@ -2 +2,7 @@
-Mon Dec 11 11:25:36 UTC 2017 - [email protected]
+Thu Jul 19 12:07:25 UTC 2018 - [email protected]
+
+- Merge with the version from SLE/Leap 15 full changes now below
+ in the changelog.
+
+-------------------------------------------------------------------
+Mon Dec 11 11:25:36 UTC 2017 - [email protected]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ patterns-devel-base.spec ++++++
--- /var/tmp/diff_new_pack.ferBZl/_old 2018-08-02 14:54:56.307955138 +0200
+++ /var/tmp/diff_new_pack.ferBZl/_new 2018-08-02 14:54:56.311955145 +0200
@@ -285,6 +285,7 @@
echo "This file marks the pattern $i to be installed." \
>"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"
done
+
%endif
for i in devel_basis devel_kernel; do
++++++ create_32bit-patterns_file.pl ++++++
--- /var/tmp/diff_new_pack.ferBZl/_old 2018-08-02 14:54:56.331955179 +0200
+++ /var/tmp/diff_new_pack.ferBZl/_new 2018-08-02 14:54:56.331955179 +0200
@@ -73,7 +73,7 @@
chomp($line);
next if ($line =~ m/^#/);
if ($line =~ m/\%package/) {
- if(($line =~ m/32bit/) or
+ if(($line =~ m/32bit/) or
($line =~ m/64bit/)
) {
$skip_it = 1;
@@ -81,9 +81,9 @@
%skip_pat_hash = map { $_ => 1 } @skip_pat;
if($skip_it==0&&!exists($skip_pat_hash{$cur_pattern})) {
$spec_file .= ""
- ."Provides: pattern() =
${cur_pattern}-32bit\n"
+ ."Provides: pattern() =
${cur_pattern}%2d32bit\n"
."Group: Metapackages\n"
- ."Supplements:
packageand(patterns-${pat_ext}:patterns-${cur_pattern})\n"
+ ."Supplements:
packageand(patterns-${product}-${pat_ext}:patterns-${product}-${cur_pattern})\n"
."\n"
."%files ${cur_pattern}-32bit\n"
."%defattr(-,root,root)\n"
@@ -123,14 +123,14 @@
$spec_file .= parse_line($line);
}
}
-
- %skip_pat_hash = map { $_ => 1 } @skip_pat;
+
+ %skip_pat_hash = map { $_ => 1 } @skip_pat;
if (!exists($skip_pat_hash{$cur_pattern})) {
# I hate this, but need a fast workaround
$spec_file .= "Provides: pattern-invisible()\n"
- ."Provides: pattern() =
${cur_pattern}-${pat_ext}\n"
+ ."Provides: pattern() =
${cur_pattern}%2d${pat_ext}\n"
."Group: Metapackages\n"
- ."Supplements:
packageand(patterns-${pat_ext}:patterns-${cur_pattern})\n"
+ ."Supplements:
packageand(patterns-${product}-${pat_ext}:patterns-${product}-${cur_pattern})\n"
."\n"
."%files ${cur_pattern}-32bit\n"
."%defattr(-,root,root)\n"
@@ -163,11 +163,10 @@
} elsif($arg =~ /-s/) {
push @skip_pat, shift;
}
-
+
}
print_debug("product = ${product}\n pat_ext=${pat_ext}\n", 1);
my $result = parse_main_file("patterns-${product}.spec");
print "${result}\n";
exit 0;
-
++++++ pattern-definition-32bit.txt ++++++
--- /var/tmp/diff_new_pack.ferBZl/_old 2018-08-02 14:54:56.355955219 +0200
+++ /var/tmp/diff_new_pack.ferBZl/_new 2018-08-02 14:54:56.355955219 +0200
@@ -38,9 +38,9 @@
Recommends: e2fsprogs-devel-32bit
Recommends: libapparmor-devel-32bit
Recommends: libosip2-devel-32bit
-Provides: pattern() = devel_basis-32bit
+Provides: pattern() = devel_basis%2d32bit
Group: Metapackages
-Supplements: packageand(patterns-32bit:patterns-devel_basis)
+Supplements:
packageand(patterns-devel-base-32bit:patterns-devel-base-devel_basis)
%files devel_basis-32bit
%defattr(-,root,root)
@@ -64,9 +64,9 @@
Recommends: gitk-32bit
Recommends: git-email-32bit
Recommends: kernel-syms-32bit
-Provides: pattern() = devel_kernel-32bit
+Provides: pattern() = devel_kernel%2d32bit
Group: Metapackages
-Supplements: packageand(patterns-32bit:patterns-devel_kernel)
+Supplements:
packageand(patterns-devel-base-32bit:patterns-devel-base-devel_kernel)
%files devel_kernel-32bit
%defattr(-,root,root)
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.ferBZl/_old 2018-08-02 14:54:56.383955265 +0200
+++ /var/tmp/diff_new_pack.ferBZl/_new 2018-08-02 14:54:56.383955265 +0200
@@ -1,4 +1,3 @@
#!/bin/sh
./create_32bit-patterns_file.pl -p devel-base -s devel_rpm_build -s devel_web
> pattern-definition-32bit.txt
-
