Hello community,
here is the log from the commit of package release-compare for openSUSE:Factory
checked in at 2020-09-29 19:02:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/release-compare (Old)
and /work/SRC/openSUSE:Factory/.release-compare.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "release-compare"
Tue Sep 29 19:02:34 2020 rev:12 rq:838300 version:0.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/release-compare/release-compare.changes
2020-09-24 16:14:48.340932323 +0200
+++
/work/SRC/openSUSE:Factory/.release-compare.new.4249/release-compare.changes
2020-09-29 19:02:45.069842566 +0200
@@ -1,0 +2,23 @@
+Mon Sep 28 12:43:23 UTC 2020 - Adrian Schröter <[email protected]>
+
+- update to version 0.4.0
+ * requires new build script!
+ * move script into obsgendiff.d directory
+ * minor output improvement
+
+-------------------------------------------------------------------
+Fri Sep 25 15:09:43 UTC 2020 - Adrian Schröter <[email protected]>
+
+- update to version 0.3.15
+ * allow to run further plugins by providing executables
+ in /usr/lib/build/obsgendiff.d
+ NOTE: we may move this functionality into build script
+
+-------------------------------------------------------------------
+Fri Sep 25 14:30:53 UTC 2020 - Adrian Schröter <[email protected]>
+
+- update to version 0.3.14
+ * Pick newest obsgendiff archive if multiple exists
+ in maintenance_release projects
+
+-------------------------------------------------------------------
Old:
----
release-compare-0.3.13.obscpio
New:
----
release-compare-0.4.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ release-compare.spec ++++++
--- /var/tmp/diff_new_pack.u0CJD9/_old 2020-09-29 19:02:47.673845729 +0200
+++ /var/tmp/diff_new_pack.u0CJD9/_new 2020-09-29 19:02:47.673845729 +0200
@@ -21,7 +21,7 @@
License: GPL-3.0-or-later
Group: Development/Tools/Building
URL: https://github.com/openSUSE/release-compare
-Version: 0.3.13
+Version: 0.4.0
Release: 0
Source: %name-%version.tar.xz
BuildArch: noarch
@@ -40,12 +40,12 @@
%build
%install
-mkdir -p $RPM_BUILD_ROOT/usr/lib/build/ $RPM_BUILD_ROOT/%_defaultdocdir/%name
-install -m 0755 obsgendiff $RPM_BUILD_ROOT/usr/lib/build/
+mkdir -p $RPM_BUILD_ROOT/usr/lib/build/obsgendiff.d
$RPM_BUILD_ROOT/%_defaultdocdir/%name
+install -m 0755 create_changelog $RPM_BUILD_ROOT/usr/lib/build/obsgendiff.d/
%check
# basic syntax check
-bash -n $RPM_BUILD_ROOT/usr/lib/build/obsgendiff || exit 1
+bash -n $RPM_BUILD_ROOT/usr/lib/build/obsgendiff.d/create_changelog || exit 1
%files
%license LICENSE
++++++ _service ++++++
--- /var/tmp/diff_new_pack.u0CJD9/_old 2020-09-29 19:02:47.713845778 +0200
+++ /var/tmp/diff_new_pack.u0CJD9/_new 2020-09-29 19:02:47.713845778 +0200
@@ -3,8 +3,8 @@
<param name="url">https://github.com/openSUSE/release-compare.git</param>
<param name="scm">git</param>
- <param name="version">0.3.13</param>
- <param name="revision">0.3.13</param>
+ <param name="version">0.4.0</param>
+ <param name="revision">0.4.0</param>
<param name="extract">release-compare.spec</param>
</service>
++++++ release-compare-0.3.13.obscpio -> release-compare-0.4.0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/release-compare-0.3.13/create_changelog
new/release-compare-0.4.0/create_changelog
--- old/release-compare-0.3.13/create_changelog 1970-01-01 01:00:00.000000000
+0100
+++ new/release-compare-0.4.0/create_changelog 2020-09-28 15:29:25.000000000
+0200
@@ -0,0 +1,168 @@
+#!/bin/bash
+
+# Copyright (c) 2020 Adrian Schröter <[email protected]>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; see the file COPYING.LIB. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307, USA
+
+#
+# This just basic demo code for now, to be rewritten/completed later
+#
+
+
+# our outut directory
+out=/.build.packages/obsgendiff
+# the former output of last released build
+released=/.build.packages/obsgendiff.released
+
+eol=$'\n'
+
+echo "Running obsgendiff data differ..."
+
+# create changelogs based on the packaged rpms
+mkdir -p $out/{rpms,changelogs}
+for report in /.build.packages/OTHER/*.report \
+ /.build.packages/KIWI/*.packages \
+ /.build.packages/DOCKER/*.packages; do
+
+ [ -e "$report" ] || continue
+
+ # skip source and debug media
+ [ "$report" = "${report/-Media2/}" ] || continue
+ [ "$report" = "${report/-Media3/}" ] || continue
+
+ # we need to be able to handle .packages from kiwi appliances
+ # and .report files from product builds. Check which case we have.
+ unset PACKAGES_MODE
+ [ "$report" == "${report%.packages}" ] || PACKAGES_MODE=1
+
+ # find and extract right obsgendiff archive
+ oldobsgendiff=${report%.packages}
+ oldobsgendiff=${oldobsgendiff%.report}.obsgendiff
+ oldobsgendiff=/.build.packages/SOURCES/${oldobsgendiff##*/}
+ # find old obsgendiff with different build number.
+ # try to find a matching name and version first
+ if [ "${oldobsgendiff/-Build*-/}" != "$oldobsgendiff" ]; then
+ oldobsgendiff=`echo ${oldobsgendiff/-Build*-/-Build*-}`
+ elif [ "${oldobsgendiff/-Build*./}" != "$oldobsgendiff" ]; then
+ # kiwi appliance
+ oldobsgendiff=`echo ${oldobsgendiff/-Build*./-Build*.}`
+ elif [ "${oldobsgendiff/-Snapshot*-/}" != "$oldobsgendiff" ]; then
+ # Factory fallback, it gets named to custom -Snapshot file name
+ oldobsgendiff=`echo ${oldobsgendiff/-Build*-/-Snapshot*-}`
+ else
+ # Dropped build number fallback (eg Jump ftp tree)
+ oldobsgendiff=`echo ${oldobsgendiff/-Media1./-Build*-Media1.}`
+ fi
+ # take last one if multiple
+ oldobsgendiff="${oldobsgendiff##* }"
+ if [ ! -e "$oldobsgendiff" ]; then
+ # try to guess where the version is in the string, no guarantee
+ oldobsgendiff=`echo $oldobsgendiff | sed
's,-[0123456789.]*-,-[0123456789\.]*-,'`
+ oldobsgendiff=`echo $oldobsgendiff`
+ oldobsgendiff="${oldobsgendiff##* }"
+ fi
+ if [ -e "$oldobsgendiff" ]; then
+ echo "Extracting $oldobsgendiff"
+ mkdir -p "${released}"
+ tar xf "$oldobsgendiff" -C "${released}"
+ else
+ echo "WARNING no old obsgendiff found: $oldobsgendiff"
+ fi
+
+ if [ -n "$PACKAGES_MODE" ]; then
+ sed -n -e
"s,\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|\(obs://[^-]*-[^|]*\)|.*,\6::::\1-\3-\4.\5.rpm,"
-e "s,^obs://.*/[^-]*-,,p" "$report"
+ else
+ # product-builder uses ', but bs_worker writes it with "...
+ sed -n -e "s,.*<binary .*disturl=.\(obs://[^-]*-[^ ]*\).
.*>.*/\(.*\)</binary>$,\1::::\2," -e 's,.*/[^-]*-\(.*::::.*\),\1,p' "$report"
+ fi | while read line; do
+
+ # rpm file name
+ rpm="${line##*::::}"
+ rpm_name=${rpm%-[^-]*-[^-]*.rpm}
+ # source package name
+ srcname="${line%::::*}"
+ # strip dot suffix from maintenance incidents
+ srcname="${srcname%%.*}"
+
+ # only the worker knows where it was downloaded from....
+ # the disturl may contained a different build repo
+ file=`echo /.build.packages/SOURCES/repos/*/*/*/$rpm`
+ file="${file//${eol}*/}" # bash internal "head -n 1" to be faster
+
+ # dump changelog for into source package name to avoid duplicates
+ # hide "first" lines to hide email adresses
+ LC_ALL=C.UTF-8 rpm -qp "$file" --changelog --nodigest --nosignature
2>/dev/null | sed '/^\* .*@.*/d' > $out/changelogs/${srcname}
+ touch $out/rpms/${rpm_name}
+ done
+
+ # create archive
+ pushd $out
+ gendiff=${report%.report}
+ gendiff=${gendiff%.packages}.obsgendiff
+ tar cfJ /.build.packages/OTHER/${gendiff##*/} .
+ popd
+
+ #
+ # All data is collected at this point
+ # Just generating the changelog files below.
+ #
+
+ # create diff to released archive
+ # NOTE: it had to be published or it won't exist
+ if [ -d "${released}" ]; then
+ # The OBS publisher is publishing all ChangeLog.*.txt files by default.
+ changelog=/.build.packages/OTHER/ChangeLog.${report##*/}
+ changelog=${changelog%.report}
+ changelog=${changelog%.packages}.txt
+ echo ""> $changelog
+
+ # removed packages
+ echo "Removed rpms">> $changelog
+ echo "============">> $changelog
+ echo "">> $changelog
+
+ find "$released/rpms/" -type f | sort | sed "s,^$released/rpms/,," | while
read file; do
+ [ -e "${out}/rpms/$file" ] || echo " - ${file##*::}" >> $changelog
+ done
+ echo "">> $changelog
+
+ # new packages
+ echo "Added rpms">> $changelog
+ echo "==========">> $changelog
+ echo "">> $changelog
+ find "$out/rpms/" -type f | sort | sed "s,^$out/rpms/,," | while read
file; do
+ [ -e "${released}/rpms/$file" ] || echo " - ${file##*::}" >> $changelog
+ done
+ echo "">> $changelog
+
+ # changed packages based on used src rpm name only
+ echo "Package Source Changes">> $changelog
+ echo "======================">> $changelog
+ echo "">> $changelog
+ # poor mans changelog generation
+ diff -ur "${released}/changelogs/" "$out/changelogs/" \
+ | grep -v '^Only in ' \
+ | grep '^[+-]' \
+ | grep -v '^--- ' \
+ | sed -e's,^+++ .*/\([^\t]*\).*$,\1,' -e 's,^::import::.*::,,' \
+ >> $changelog
+ fi
+
+done
+
+
+exit 0
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/release-compare-0.3.13/obsgendiff
new/release-compare-0.4.0/obsgendiff
--- old/release-compare-0.3.13/obsgendiff 2020-09-23 13:10:12.000000000
+0200
+++ new/release-compare-0.4.0/obsgendiff 1970-01-01 01:00:00.000000000
+0100
@@ -1,163 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2020 Adrian Schröter <[email protected]>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; see the file COPYING.LIB. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307, USA
-
-#
-# This just basic demo code for now, to be rewritten/completed later
-#
-
-
-# our outut directory
-out=/.build.packages/obsgendiff
-# the former output of last released build
-released=/.build.packages/obsgendiff.released
-
-eol=$'\n'
-
-echo "Running obsgendiff data differ..."
-
-# create changelogs based on the packaged rpms
-mkdir -p $out/{rpms,changelogs}
-for report in /.build.packages/OTHER/*.report \
- /.build.packages/KIWI/*.packages \
- /.build.packages/DOCKER/*.packages; do
-
- [ -e "$report" ] || continue
-
- # skip source and debug media
- [ "$report" = "${report/-Media2/}" ] || continue
- [ "$report" = "${report/-Media3/}" ] || continue
-
- # we need to be able to handle .packages from kiwi appliances
- # and .report files from product builds. Check which case we have.
- unset PACKAGES_MODE
- [ "$report" == "${report%.packages}" ] || PACKAGES_MODE=1
-
- # find and extract right obsgendiff archive
- oldobsgendiff=${report%.packages}
- oldobsgendiff=${oldobsgendiff%.report}.obsgendiff
- oldobsgendiff=/.build.packages/SOURCES/${oldobsgendiff##*/}
- # find old obsgendiff with different build number.
- # try to find a matching name and version first
- if [ "${oldobsgendiff/-Build*-/}" != "$oldobsgendiff" ]; then
- oldobsgendiff=`echo ${oldobsgendiff/-Build*-/-Build*-}`
- elif [ "${oldobsgendiff/-Build*./}" != "$oldobsgendiff" ]; then
- # kiwi appliance
- oldobsgendiff=`echo ${oldobsgendiff/-Build*./-Build*.}`
- elif [ "${oldobsgendiff/-Snapshot*-/}" != "$oldobsgendiff" ]; then
- # Factory fallback, it gets named to custom -Snapshot file name
- oldobsgendiff=`echo ${oldobsgendiff/-Build*-/-Snapshot*-}`
- else
- # Dropped build number fallback (eg Jump ftp tree)
- oldobsgendiff=`echo ${oldobsgendiff/-Media1./-Build*-Media1.}`
- fi
- if [ ! -e "$oldobsgendiff" ]; then
- # try to guess where the version is in the string, no guarantee
- oldobsgendiff=`echo $oldobsgendiff | sed
's,-[0123456789.]*-,-[0123456789\.]*-,'`
- oldobsgendiff=`echo $oldobsgendiff`
- fi
- if [ -e "$oldobsgendiff" ]; then
- echo "Extracting $oldobsgendiff"
- mkdir -p "${released}"
- tar xf "$oldobsgendiff" -C "${released}"
- else
- echo "WARNING no old obsgendiff found: $oldobsgendiff"
- fi
-
- if [ -n "$PACKAGES_MODE" ]; then
- sed -n -e
"s,\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|\(obs://[^-]*-[^|]*\)|.*,\6::::\1-\3-\4.\5.rpm,"
-e "s,^obs://.*/[^-]*-,,p" "$report"
- else
- # product-builder uses ', but bs_worker writes it with "...
- sed -n -e "s,.*<binary .*disturl=.\(obs://[^-]*-[^ ]*\).
.*>.*/\(.*\)</binary>$,\1::::\2," -e 's,.*/[^-]*-\(.*::::.*\),\1,p' "$report"
- fi | while read line; do
-
- # rpm file name
- rpm="${line##*::::}"
- rpm_name=${rpm%-[^-]*-[^-]*.rpm}
- # source package name
- srcname="${line%::::*}"
- # strip dot suffix from maintenance incidents
- srcname="${srcname%%.*}"
-
- # only the worker knows where it was downloaded from....
- # the disturl may contained a different build repo
- file=`echo /.build.packages/SOURCES/repos/*/*/*/$rpm`
- file="${file//${eol}*/}" # bash internal "head -n 1" to be faster
-
- # dump changelog for into source package name to avoid duplicates
- # hide "first" lines to hide email adresses
- LC_ALL=C.UTF-8 rpm -qp "$file" --changelog --nodigest --nosignature
2>/dev/null | sed '/^\* .*@.*/d' > $out/changelogs/${srcname}
- touch $out/rpms/${rpm_name}
- done
-
- # create archive
- pushd $out
- gendiff=${report%.report}
- gendiff=${gendiff%.packages}.obsgendiff
- tar cfJ /.build.packages/OTHER/${gendiff##*/} .
- popd
-
- #
- # All data is collected at this point
- # Just generating the changelog files below.
- #
-
- # create diff to released archive
- # NOTE: it had to be published or it won't exist
- if [ -d "${released}" ]; then
- # The OBS publisher is publishing all ChangeLog.*.txt files by default.
- changelog=/.build.packages/OTHER/ChangeLog.${report##*/}
- changelog=${changelog%.report}
- changelog=${changelog%.packages}.txt
- echo ""> $changelog
-
- # removed packages
- echo "Removed packages">> $changelog
- echo "================">> $changelog
- echo "">> $changelog
-
- find "$released/rpms/" -type f | sort | sed "s,^$released/rpms/,," | while
read file; do
- [ -e "${out}/rpms/$file" ] || echo " - ${file##*::}" >> $changelog
- done
- echo "">> $changelog
-
- # new packages
- echo "New packages">> $changelog
- echo "============">> $changelog
- echo "">> $changelog
- find "$out/rpms/" -type f | sort | sed "s,^$out/rpms/,," | while read
file; do
- [ -e "${released}/rpms/$file" ] || echo " - ${file##*::}" >> $changelog
- done
- echo "">> $changelog
-
- # changed packages based on used src rpm name only
- echo "Package updates">> $changelog
- echo "===============">> $changelog
- echo "">> $changelog
- # poor mans changelog generation
- diff -ur "${released}/changelogs/" "$out/changelogs/" \
- | grep -v '^Only in ' \
- | grep '^[+-]' \
- | grep -v '^--- ' \
- | sed -e's,^+++ .*/\([^\t]*\).*$,\1,' -e 's,^::import::.*::,,' \
- >> $changelog
- fi
-
-done
-exit 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/release-compare-0.3.13/release-compare.spec
new/release-compare-0.4.0/release-compare.spec
--- old/release-compare-0.3.13/release-compare.spec 2020-09-23
13:10:12.000000000 +0200
+++ new/release-compare-0.4.0/release-compare.spec 2020-09-28
15:29:25.000000000 +0200
@@ -40,12 +40,12 @@
%build
%install
-mkdir -p $RPM_BUILD_ROOT/usr/lib/build/ $RPM_BUILD_ROOT/%_defaultdocdir/%name
-install -m 0755 obsgendiff $RPM_BUILD_ROOT/usr/lib/build/
+mkdir -p $RPM_BUILD_ROOT/usr/lib/build/obsgendiff.d
$RPM_BUILD_ROOT/%_defaultdocdir/%name
+install -m 0755 create_changelog $RPM_BUILD_ROOT/usr/lib/build/obsgendiff.d/
%check
# basic syntax check
-bash -n $RPM_BUILD_ROOT/usr/lib/build/obsgendiff || exit 1
+bash -n $RPM_BUILD_ROOT/usr/lib/build/obsgendiff.d/create_changelog || exit 1
%files
%license LICENSE
++++++ release-compare.obsinfo ++++++
--- /var/tmp/diff_new_pack.u0CJD9/_old 2020-09-29 19:02:47.825845914 +0200
+++ /var/tmp/diff_new_pack.u0CJD9/_new 2020-09-29 19:02:47.829845919 +0200
@@ -1,5 +1,5 @@
name: release-compare
-version: 0.3.13
-mtime: 1600859412
-commit: edb4aadca92d0c2789e366fcd73a997305774c35
+version: 0.4.0
+mtime: 1601299765
+commit: 8845a7d44c0254100130376732631dc694fb99a5
