Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2015-01-30 06:02:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build-compare"
Changes:
--------
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2014-12-01 14:00:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2015-01-30 06:02:05.000000000 +0100
@@ -1,0 +2,17 @@
+Wed Jan 21 08:34:32 UTC 2015 - o...@aepfle.de
+
+- 2015.01.21
+- Remove leading spaces from file(1) output
+- Force removal of tmpdir to handle files marked as read-only
+
+-------------------------------------------------------------------
+Fri Jan 9 09:37:34 UTC 2015 - o...@aepfle.de
+
+- 2015.01.14
+- Trim VERSION-RELEASE instead of RELEASE because the release number
+ will match other substrings.
+- Use regex instead in sed /regex/ to match dots properly
+- Handle plain cpio archives from gfxboot
+- Add patterns for .TH header in man pages to handle all cases
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build-compare.spec ++++++
--- /var/tmp/diff_new_pack.SfgX1Y/_old 2015-01-30 06:02:08.000000000 +0100
+++ /var/tmp/diff_new_pack.SfgX1Y/_new 2015-01-30 06:02:08.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package build-compare
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -20,7 +20,7 @@
Summary: Build Result Compare Script
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 2014.11.25
+Version: 2015.01.21
Release: 0
Source1: COPYING
Source2: same-build-result.sh
++++++ functions.sh ++++++
--- /var/tmp/diff_new_pack.SfgX1Y/_old 2015-01-30 06:02:08.000000000 +0100
+++ /var/tmp/diff_new_pack.SfgX1Y/_new 2015-01-30 06:02:08.000000000 +0100
@@ -15,26 +15,26 @@
$RPM --qf "$QF" "$1"
}
-# Trim release string:
+# Trim version-release string:
# - it is used as direntry below certain paths
# - it is assigned to some variable in scripts, at the end of a line
# - it is used in PROVIDES, at the end of a line
function trim_release_old()
{
- sed -e
"/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$release_old\$\)/{s,-$release_old_regex_l,-@RELEASE_LONG@,g;s,-$release_old_regex_s,-@RELEASE_SHORT@,g}"
+ sed -e
"/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g}"
}
function trim_release_new()
{
- sed -e
"/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$release_new\$\)/{s,-$release_new_regex_l,-@RELEASE_LONG@,g;s,-$release_new_regex_s,-@RELEASE_SHORT@,g}"
+ sed -e
"/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g}"
}
# Get single directory or filename with long or short release string
function grep_release_old()
{
- grep -E
"(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(-${release_old_regex_l}(\$|[^/]+\$)|-${release_old_regex_s}(\$|[^/]+\$))"
+ grep -E
"(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))"
}
function grep_release_new()
{
- grep -E
"(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(-${release_new_regex_l}(\$|[^/]+\$)|-${release_new_regex_s}(\$|[^/]+\$))"
+ grep -E
"(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))"
}
function check_provides()
@@ -117,19 +117,19 @@
fi
# Remember to quote the . which is in release
- release_old=$($RPM --qf "%{RELEASE}" "$oldrpm")
- release_new=$($RPM --qf "%{RELEASE}" "$newrpm")
+ version_release_old=$($RPM --qf "%{VERSION}-%{RELEASE}" "$oldrpm")
+ version_release_new=$($RPM --qf "%{VERSION}-%{RELEASE}" "$newrpm")
# Short version without B_CNT
- release_old_regex_s=${release_old%.*}
- release_old_regex_s=${release_old_regex_s//./\\.}
- release_new_regex_s=${release_new%.*}
- release_new_regex_s=${release_new_regex_s//./\\.}
+ version_release_old_regex_s=${version_release_old%.*}
+ version_release_old_regex_s=${version_release_old_regex_s//./\\.}
+ version_release_new_regex_s=${version_release_new%.*}
+ version_release_new_regex_s=${version_release_new_regex_s//./\\.}
# Long version with B_CNT
- release_old_regex_l=${release_old//./\\.}
- release_new_regex_l=${release_new//./\\.}
+ version_release_old_regex_l=${version_release_old//./\\.}
+ version_release_new_regex_l=${version_release_new//./\\.}
# This might happen when?!
echo "comparing RELEASE"
- if [ "${release_old%.*}" != "${release_new%.*}" ] ; then
+ if [ "${version_release_old%.*}" != "${version_release_new%.*}" ] ; then
case $($RPM --qf '%{NAME}' "$newrpm") in
kernel-*)
# Make sure all kernel packages have the same %RELEASE
++++++ rpm-check.sh ++++++
--- /var/tmp/diff_new_pack.SfgX1Y/_old 2015-01-30 06:02:08.000000000 +0100
+++ /var/tmp/diff_new_pack.SfgX1Y/_new 2015-01-30 06:02:08.000000000 +0100
@@ -193,9 +193,9 @@
xz -d new/$file.xz
;;
esac
- ftype=`/usr/bin/file old/$file | cut -d: -f2-`
+ ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'`
case $ftype in
- *POSIX\ tar\ archive)
+ POSIX\ tar\ archive)
echo "$ext content is: $ftype"
mv old/$file{,.tar}
mv new/$file{,.tar}
@@ -203,7 +203,7 @@
ret=1
fi
;;
- *ASCII\ cpio\ archive\ *)
+ ASCII\ cpio\ archive\ *)
echo "$ext content is: $ftype"
mv old/$file{,.cpio}
mv new/$file{,.cpio}
@@ -257,11 +257,12 @@
*.cpio)
flist=`cpio --quiet --list --force-local < "new/$file"`
pwd=$PWD
- fdir=`dirname $file`
+ fdir=$file.extract.$PPID.$$
+ mkdir old/$fdir new/$fdir
cd old/$fdir
- cpio --quiet --extract --force-local < "${file##*/}"
+ cpio --quiet --extract --force-local < "../${file##*/}"
cd $pwd/new/$fdir
- cpio --quiet --extract --force-local < "${file##*/}"
+ cpio --quiet --extract --force-local < "../${file##*/}"
cd $pwd
local ret=0
for f in $flist; do
@@ -272,6 +273,7 @@
fi
fi
done
+ rm -rf old/$fdir new/$fdir
return $ret
;;
*.tar|*.tar.bz2|*.tar.gz|*.tgz|*.tbz2)
@@ -434,19 +436,20 @@
# .TH gv 3guile "13 May 2010"
#.TH "GIT\-ARCHIMPORT" "1" "09/13/2010" "Git 1\&.7\&.1" "Git Manual"
# .TH LDIRECTORD 8 "2010-10-20" "perl v5.12.2" "User Contributed Perl
Documentation"
-
- for f in old/$file new/$file; do
- sed -i -e 's|.TH "\?\([^ "]*\)"\? "\?\([0-9][a-z]*\)"\?
"\?\(20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]\|[0-9]* [A-Z][a-z]* 20[0-9][0-9]\)"\?
|.TH \1 \2 "2000-01-01" |' $f
- sed -i -e 's|.TH "\?\([^ "]*\)"\? "\?\([0-9][a-z]*\)"\?
"\?\([0-1][0-9]/[0-9][0-9]/201[0-9]\)"\? |.TH \1 \2 "2000-01-01" |' $f
- sed -i -e 's|.TH \(.*\) "\?\(20[0-1][0-9]-[0-9][0-9]-[0-9][0-9]\)"\?
|.TH \1 "2000-01-01" |' $f
# .TH ccmake 1 "February 05, 2012" "ccmake 2.8.7"
- sed -i -e 's|^.TH "\?\([^ "]*\)"\? "\?\([0-9][a-z]*\)"\?
"\?\([A-Z][a-z]* [0-9][0-9], 20[0-9][0-9]\)"\? |.TH \1 \2 "2000-01-01" |' $f
# .TH "appender.h" 3 "Tue Aug 31 2010" "Version 1.2.1" "log4c" \" -*-
nroff -*-
- sed -i -e 's|.TH "\?\([^ "]*\)"\? "\?\([0-9][a-z]*\)"\?
"\?[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+ 20[0-9][0-9]"\? |.TH \1 \2
"2000-01-01" |' $f
# .TH ARCH "1" "September 2010" "GNU coreutils 8.5" "User Commands"
- sed -i -e 's|.TH "\?\([^ "]*\)"\? "\?\([0-9][a-z]*\)"\? "\?[A-Z][a-z]*
20[0-9][0-9]"\? |.TH \1 \2 "2000-01-01" |' $f
# .TH "GCM-CALIBRATE" "1" "03 February 2012" "" ""
- sed -i -e 's|.TH "\?\([^ "]*\)"\? "\?\([0-9][a-z]*\)"\? "\?[0-9]*
[A-Z][a-z]* 20[0-9][0-9]"\? |.TH \1 \2 "2000-01-01" |' $f
+
+ for f in old/$file new/$file; do
+ # (.TH quoted section) (quoted_date)(*)
+ sed -i -e
's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1
"qq2000-01-01"\3|' $f
+ # (.TH unquoted section) (quoted_date)(*)
+ sed -i -e
's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1
"uq2000-02-02"\3|' $f
+ # (.TH quoted section) (unquoted_date)(*)
+ sed -i -e
's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1
qu2000-03-03\3|' $f
+ # (.TH unquoted section) (unquoted_date)(*)
+ sed -i -e
's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1
uu2000-04-04\3|' $f
# generated by docbook xml:
#.\" Date: 09/13/2010
sed -i -e 's|Date: [0-1][0-9]/[0-9][0-9]/201[0-9]|Date: 09/13/2010|'
$f
@@ -547,9 +550,9 @@
;;
esac
- ftype=`/usr/bin/file old/$file | cut -d: -f2-`
+ ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'`
case $ftype in
- *PE32\ executable*Mono\/\.Net\ assembly*)
+ PE32\ executable*Mono\/\.Net\ assembly*)
echo "PE32 Mono/.Net assembly: $file"
if [ -x /usr/bin/monodis ] ; then
monodis old/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'>
${file1}
@@ -564,7 +567,7 @@
return 1
fi
;;
- *ELF*executable*|*ELF*[LM]SB\ shared\ object*)
+ ELF*executable*|ELF*[LM]SB\ shared\ object*)
objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1
if ! test -s $file1; then
# objdump has no idea how to handle it
@@ -605,26 +608,33 @@
return 1
fi
;;
- *directory)
+ directory)
# tar might package directories - ignore them here
return 0
;;
- *bzip2\ compressed\ data*)
+ bzip2\ compressed\ data*)
if ! check_compressed_file "$file" "bz2"; then
return 1
fi
;;
- *gzip\ compressed\ data*)
+ gzip\ compressed\ data*)
if ! check_compressed_file "$file" "gzip"; then
return 1
fi
;;
- *XZ\ compressed\ data*)
+ XZ\ compressed\ data*)
if ! check_compressed_file "$file" "xz"; then
return 1
fi
;;
- *symbolic\ link\ to\ *)
+ cpio\ archive)
+ mv old/$file{,.cpio}
+ mv new/$file{,.cpio}
+ if ! check_single_file ${file}.cpio; then
+ return 1
+ fi
+ ;;
+ symbolic\ link\ to\ *)
readlink "old/$file" > $file1
readlink "new/$file" > $file2
if ! diff -u $file1 $file2; then
@@ -667,7 +677,7 @@
fi
rm $file1 $file2 $dfile $rename_script
-rm -r $dir
+rm -rf $dir
if test "$ret" = 0; then
echo "RPM content is identical"
fi
++++++ srpm-check.sh ++++++
--- /var/tmp/diff_new_pack.SfgX1Y/_old 2015-01-30 06:02:08.000000000 +0100
+++ /var/tmp/diff_new_pack.SfgX1Y/_new 2015-01-30 06:02:08.000000000 +0100
@@ -90,5 +90,5 @@
fi
done
-rm -r $dir
+rm -rf $dir
exit $ret
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
