Hello community, here is the log from the commit of package brp-check-suse for openSUSE:Factory checked in at 2014-07-30 07:34:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brp-check-suse (Old) and /work/SRC/openSUSE:Factory/.brp-check-suse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brp-check-suse" Changes: -------- --- /work/SRC/openSUSE:Factory/brp-check-suse/brp-check-suse.changes 2014-07-10 09:32:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.brp-check-suse.new/brp-check-suse.changes 2014-07-30 07:34:16.000000000 +0200 @@ -1,0 +2,37 @@ +Sun Jul 27 07:40:38 UTC 2014 - sleep_wal...@suse.cz + +- brp-25-symlink: add mising '/etc/alternatives' back to whitelist + +------------------------------------------------------------------- +Sat Jul 26 12:27:00 UTC 2014 - sleep_wal...@suse.cz + +- brp-25-symlink: fix eating /./ in path + +------------------------------------------------------------------- +Fri Jul 25 17:47:24 UTC 2014 - sleep_wal...@suse.cz + +- massive rewrite of brp-25-symlink to reduce number of calls our + tests shown speedup from 8,5 mins to 1 min for kernel-default + (year ago) + +------------------------------------------------------------------- +Wed Jul 23 22:54:50 UTC 2014 - sleep_wal...@suse.cz + +- All GTK apps are allowed to assume the presence of the + Adwaita-icon-theme package; As a result of this, we now accept icons + in icons/Adwaita on the whitelist (just as hicolor). + patch by DimStar + +------------------------------------------------------------------- +Wed Jul 23 22:15:02 UTC 2014 - sleep_wal...@suse.cz + +- remove brp-20-check-la, it is broken and la files are mostly + deleted anyway +- reduction of number of calls used by using more bashism, passing + more regexp at once, use more double quotes + brp-15-strip-debug + brp-45-tcl + brp-50-check-python + brp-60-hook + +------------------------------------------------------------------- Old: ---- brp-check-suse-13.2+git20140702.039494f.tar.xz New: ---- brp-check-suse-13.2+git20140727.d76b99d.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brp-check-suse.spec ++++++ --- /var/tmp/diff_new_pack.wpPqhK/_old 2014-07-30 07:34:17.000000000 +0200 +++ /var/tmp/diff_new_pack.wpPqhK/_new 2014-07-30 07:34:17.000000000 +0200 @@ -23,7 +23,7 @@ Group: Development/Tools/Building # we need the full perl because of XML Parsing and utf-8 Requires: perl -Version: 13.2+git20140702.039494f +Version: 13.2+git20140727.d76b99d Release: 0 Url: http://gitorious.org/opensuse/brp-check-suse/ # ++++++ brp-check-suse-13.2+git20140702.039494f.tar.xz -> brp-check-suse-13.2+git20140727.d76b99d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140702.039494f/brp-15-strip-debug new/brp-check-suse-13.2+git20140727.d76b99d/brp-15-strip-debug --- old/brp-check-suse-13.2+git20140702.039494f/brp-15-strip-debug 2014-07-02 15:12:51.000000000 +0200 +++ new/brp-check-suse-13.2+git20140727.d76b99d/brp-15-strip-debug 2014-07-27 09:40:17.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # If using normal root, avoid changing anything. if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then echo "RPM_BUILD_ROOT is not set or set to / : skipping strip" @@ -9,30 +9,39 @@ exit 0 fi -FIND_IGNORE='\( -path $RPM_BUILD_ROOT/usr/lib/debug -o -path $RPM_BUILD_ROOT/lib/modules -o -path $RPM_BUILD_ROOT/opt/cross -o -path $RPM_BUILD_ROOT/proc \) -prune -o' +FIND_IGNORE=( + '(' + -path "$RPM_BUILD_ROOT/usr/lib/debug" -o -path + "$RPM_BUILD_ROOT/lib/modules" -o -path "$RPM_BUILD_ROOT/opt/cross" -o + -path "$RPM_BUILD_ROOT/proc" + ')' + -prune -o +) # Strip debuginfo from ELF binaries, but not static libraries or kernel modules -for f in $(find $RPM_BUILD_ROOT $(echo "$(eval "echo $FIND_IGNORE")") \ - \( -name "*.a" -o -name "*.ko" \) -prune -o \ - -type f \( -perm /0111 -o -name "*.so*" \) -exec file {} \; | \ - sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'); do - mode=$(stat -c %a $f) - chmod u+w $f || : - strip -p --strip-debug --discard-locals -R .comment -R .note $f || : - chmod $mode $f -done +while read f; do + mode="$(stat -c %a "$f")" + chmod u+w "$f" || : + strip -p --strip-debug --discard-locals -R .comment -R .note "$f" || : + chmod "$mode" "$f" +done < <( + find "$RPM_BUILD_ROOT" "${FIND_IGNORE[@]}" \( -name "*.a" -o -name "*.ko" \) \ + -prune -o \ + -type f \( -perm /0111 -o -name "*.so*" \) \ + -exec file {} + | \ + sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p' +) # Don't strip debuginfo from static libs, but compiler-generated local symbols -for f in $(find $RPM_BUILD_ROOT $(echo "$(eval "echo $FIND_IGNORE")") \ - -type f -name "*.a" -print) ; do - case $(file $f) in +while read f; do + case $(file "$f") in *"current ar"*|*ELF*", not stripped"*) - chmod u+w $f || : - strip -p --discard-locals -R .comment -R .note $f || : + chmod u+w "$f" || : + strip -p --discard-locals -R .comment -R .note "$f" || : ;; *) echo "WARNING: Strange looking archive $(file $f)" continue ;; esac -done +done < <(find "$RPM_BUILD_ROOT" "${FIND_IGNORE[@]}" -type f -name "*.a" -print) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140702.039494f/brp-20-check-la new/brp-check-suse-13.2+git20140727.d76b99d/brp-20-check-la --- old/brp-check-suse-13.2+git20140702.039494f/brp-20-check-la 2014-07-02 15:12:51.000000000 +0200 +++ new/brp-check-suse-13.2+git20140727.d76b99d/brp-20-check-la 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ -#!/bin/sh -# If using normal root, avoid changing anything. -if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then - exit 0 -fi - -MASTER_ERROR_CODE=0 -for f in `find $RPM_BUILD_ROOT -type f -name "*.la" ` ; do - # first try to see if this really looks like a libtool file - grep -q "libdir=" $f || continue - grep -q "library_names=" $f || continue - ERROR_CODE=0 - grep -q "libdir=.*$RPM_BUILD_ROOT" $f && ERROR_CODE=1 - grep -q "libdir=.*/usr/src/packages/BUILD/" $f && ERROR_CODE=2 - grep -q "dependency_libs=.*$RPM_BUILD_ROOT" $f && ERROR_CODE=3 - grep -q "dependency_libs=.*/usr/src/packages/BUILD/" $f && ERROR_CODE=4 - chmod -x -- "$f" 2>/dev/null - if [ "$ERROR_CODE" != "0" ] ; then - MASTER_ERROR_CODE=$ERROR_CODE - echo "found trace of \$RPM_BUILD_ROOT or \$RPM_BUILD_DIR" - echo "in installed .la file $f" - fi - - . $f - NON_TRIVIAL_DEP=0 - if test -z "$dependency_libs" -a "$shouldnotlink" = "no"; then - echo "WARNING: found empty dependency_libs variable. please remove" - echo " the pointless libtool .la file $f" - echo " If you don't understand this, mailto=rguent...@suse.de" - # make this an error after 10.2 - #MASTER_ERROR_CODE=$ERROR_CODE - NON_TRIVIAL_DEP=1 - fi - - for dep in $dependency_libs; do - case $dep in - -l*) - NON_TRIVIAL_DEP=1 - break - ;; - *.la) - NON_TRIVIAL_DEP=1 - break - ;; - -L/usr/lib) - ;; - -L/lib) - ;; - -L/usr/lib64) - ;; - -L/lib64) - break - ;; - -L*) - NON_TRIVIAL_DEP=1 - break - ;; - *) - ;; - esac - done - - if test "$shouldnotlink" != "yes" -a $NON_TRIVIAL_DEP = 0; then - echo "WARNING: found only trivial dependencies. consider removing" - echo " the pointless libtool .la file $f" - echo " If you don't understand this, mailto=rguent...@suse.de" - fi -done - -exit $MASTER_ERROR_CODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140702.039494f/brp-25-symlink new/brp-check-suse-13.2+git20140727.d76b99d/brp-25-symlink --- old/brp-check-suse-13.2+git20140702.039494f/brp-25-symlink 2014-07-02 15:12:51.000000000 +0200 +++ new/brp-check-suse-13.2+git20140727.d76b99d/brp-25-symlink 2014-07-27 09:40:17.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Task: go through the files in $RPM_BUILD_ROOT and # relink symbolic links so that: @@ -14,32 +14,77 @@ # dangling symlinks or symlinks to init scripts in wrong location # Author: Stephan Kulow <co...@suse.de> +# +# major speedup: Tomas Cech <sleep_wal...@suse.cz> and Michal Kubecek <mkube...@suse.cz> # If using normal root, avoid changing anything. if [ -z "$RPM_BUILD_ROOT" ]; then exit 0 fi +strip_slashes() { + local loc="${!1}" + local tmp="${loc//\/\///}" + while [ "$loc" != "$tmp" ]; do + loc="$tmp" + tmp="${loc//\/\///}" + done + eval "$1"="'$loc'" +} + +eat_component() { + loc="${!1}" + local rslt="${loc#/*/}" + if [ "$rslt" != "$loc" ]; then + rslt="/$rslt" + else + rslt="${loc##/*}" + fi + eval "$1"="'$rslt'" +} + +top_dir () { + local rslt + if [ "${1:0:1}" = / ]; then + rslt="${1:1}" + rslt="/${rslt%%/*}" + else + rslt="$1" + fi + eval "$2"="'$rslt'" +} + LC_ALL= LANG= LC_TIME=POSIX -BASENAME=/usr/bin/basename -DIRNAME=/usr/bin/dirname -READLINK=/usr/bin/readlink +basename_int() { + echo "${1##*/}" +} + +dirname_int() { + local rslt="${1%/*}" + if [ -n "$rslt" ]; then + echo "$rslt" + elif [ "${1:0:1}" = / ]; then + echo / + else + echo . + fi +} cd $RPM_BUILD_ROOT had_errors=0 -links=`find . -type l | sed -e "s,^./,/,"` -for link in $links +while IFS="|" read link link_dir link_dest do - link_dest=`$READLINK ./$link` - orig_link_dest=$link_dest + link="${link#.}" + link_dir="${link_dir#.}" + orig_link_dest="$link_dest" new_link_dest=NONE - link_dir=`$DIRNAME $link` + link_dir="$(dirname_int $link)" case $link_dest in .|..|../..) # link to current dir @@ -57,15 +102,17 @@ esac # cleaning out double slash - link_dest=`echo $link_dest | sed -e 's,//*,/,g; s,/\.$,/,; s,/$,,'` + strip_slashes link_dest + link_dest="${link_dest%.}" + link_dest="${link_dest%/}" # eliminating /./ components - link_dest=`echo $link_dest | sed -e "s,/\./,/,g"`; + link_dest="${link_dest//\/.\///}" counter=0 # eliminating back references - while echo $link_dest | egrep -q '/\.\.'; do - link_dest=`echo $link_dest | sed -e "s,/[^/]*/\.\.,,"`; + while [[ $link_dest =~ /\.\. ]]; do + link_dest="$(sed "s@/[^/]\+/\.\.@@" <<< "$link_dest")" case $link_dest in /..*) # this is very mean echo "ERROR: $link points to illegal $link_dest" @@ -120,73 +167,75 @@ forced_absolute=0 for prefix in /usr/X11R6/lib/X11 /usr/X11R6/include/X11 /usr/X11R6/lib/X11/app-defaults ; do - if echo $link | grep -q "^$prefix/"; then - if echo $link_dest | grep -q "^$prefix/"; then - # if it's below it, it's fine - : - else + if [[ $link =~ ^$prefix/ ]]; then + if ! [[ $link_dest =~ ^$prefix/ ]]; then + # not ok forced_absolute=1 fi fi done - dest_dir=`$DIRNAME $link_dest` + dest_dir="$(dirname_int $link_dest)" # figuring out (currently) correct destination - if test "$link_dir" = "$dest_dir" || test "$dest_dir" = "."; then - new_link_dest=`$BASENAME $link_dest` + if [ "$link_dir" = "$dest_dir" -o "$dest_dir" = "." ]; then + new_link_dest="$(basename_int $link_dest)" else # figuring out top level directory - top_link=`echo $link | sed -e 's,^\(/[^/]*\)/.*,\1,'` - top_dest=`echo $link_dest | sed -e 's,^\(/[^/]*\)/.*,\1,'` - if test "$forced_absolute" = 0 && test "$top_link" = "$top_dest"; then # supposed to be relative + top_dir "$link" top_link + top_dir "$link_dest" top_dest + if [ "$forced_absolute" = 0 -a "$top_link" = "$top_dest" ]; then # supposed to be relative # first we need to cut out the common prefix link_tmp=$link - while test "$top_link" = "$top_dest"; do + while [ "$top_link" = "$top_dest" ]; do link_orig=$link_tmp dest_orig=$link_dest - link_tmp=`echo $link_tmp | sed -e 's,^\(/[^/]*\)/,/,'` - link_dest=`echo $link_dest | sed -e 's,^\(/[^/]*\)/,/,'` - top_link=`echo $link_tmp | sed -e 's,^\(/[^/]*\)/.*,\1,'` - top_dest=`echo $link_dest | sed -e 's,^\(/[^/]*\)/.*,\1,'` - - if test "$top_dest" = "$dest_orig" || test "$top_link" = "$link_orig"; then - link_tmp=$link_orig - link_dest=$dest_orig + link_tmp="/${link_tmp#/*/}" + link_dest="/${link_dest#/*/}" + top_link="${link_tmp#/}" + top_link="/${top_link%%/*}" + top_dest="${link_dest#/}" + top_dest="/${top_dest%%/*}" + + if [ "$top_dest" = "$dest_orig" -o "$top_link" = "$link_orig" ]; then + link_tmp="$link_orig" + link_dest="$dest_orig" break fi done # now we add a .. for every directory component - link_tmp=`$DIRNAME $link_tmp` + link_tmp="$(dirname_int $link_tmp)" - if test "$link_tmp" = "$link_dest"; then + if [ "$link_tmp" = "$link_dest" ]; then new_link_dest=. - elif test "$link_tmp" != "/"; then # we have a directory component + elif [ "$link_tmp" != "/" ]; then # we have a directory component link_rel= - while test -n "$link_tmp"; do - link_tmp=`echo $link_tmp | sed -e 's,^\(/[^/]*\),,'` + while [ -n "$link_tmp" ]; do + eat_component link_tmp link_rel="../$link_rel" done - new_link_dest=`echo $link_rel/$link_dest | sed -e "s,//*,/,g"` + new_link_dest="$link_rel/$link_dest" + strip_slashes new_link_dest + else # get rid of the slash - link_dest=`echo $link_dest | sed -e 's,^/,,'` - new_link_dest=$link_dest + link_dest="${link_dest#/}" + new_link_dest="$link_dest" fi else - new_link_dest=$link_dest + new_link_dest="$link_dest" fi fi - if test "$new_link_dest" != NONE && test "$new_link_dest" != "$orig_link_dest"; then + if [ "$new_link_dest" != NONE -a "$new_link_dest" != "$orig_link_dest" ]; then echo "INFO: relinking $link -> $new_link_dest (was $orig_link_dest)" rm ./$link && ln -s $new_link_dest ./$link fi -done +done < <(find . -type l -printf '%p|%h|%l\n') if test "$had_errors" = 1; then exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140702.039494f/brp-40-rootfs new/brp-check-suse-13.2+git20140727.d76b99d/brp-40-rootfs --- old/brp-check-suse-13.2+git20140702.039494f/brp-40-rootfs 2014-07-02 15:12:51.000000000 +0200 +++ new/brp-check-suse-13.2+git20140727.d76b99d/brp-40-rootfs 2014-07-27 09:40:17.000000000 +0200 @@ -1,46 +1,28 @@ -#!/bin/sh +#!/bin/bash + +# purpose of this test is to check that no generated binary is linked against anything in /opt +# # If using normal root, avoid check. Will give too much false positive + if [ -z "$RPM_BUILD_ROOT" ]; then exit 0 fi OUT_OF_FS=0 -for f in `find $RPM_BUILD_ROOT/bin $RPM_BUILD_ROOT/sbin \ - -type f -exec file {} \; 2>/dev/null | \ - sed -n -e 's/^\(.*\):[[:space:]]*ELF.*/\1/p'` ; do - case ${f##$RPM_BUILD_ROOT} in - /bin/rpm|/sbin/install-info) - continue - ;; - esac - - ldd $f | grep -qE '/opt' && { - echo "binary ${f##$RPM_BUILD_ROOT} is linked against libraries in /opt" - ldd $f | grep -E '/opt' - OUT_OF_FS=1 - } -done - -for f in `find $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib64 \ - -type f -exec file {} \; 2>/dev/null | \ - grep "shared object" | \ - grep -v "/security/" | - grep -v "/evms/" | - grep -v "/libnss_" | - sed -n -e 's/^\(.*\):[[:space:]]*ELF.*/\1/p'` ; do - ldd $f 2>/dev/null | grep -q '/opt' && { - echo "library ${f##$RPM_BUILD_ROOT} is linked against libraries in /opt" - ldd $f | grep -E '/opt' - OUT_OF_FS=1 - } -done - -if [ $OUT_OF_FS -eq 1 ]; then - echo "" - echo "Please adjust the paths in your package" - echo - exit 1 + +if { + find "$RPM_BUILD_ROOT"/{bin,sbin} -type f -exec file {} + 2>/dev/null | tee /tmp/find | \ + sed -n -e 's/^\(.*\):[[:space:]]*ELF.*/\1/p;/\/bin\/rpm/d;/\/sbin\/install-info/d' \ + -e '/shared object/{/\/\(security\|evms\|libnss_\)\//d;s/^\(.*\):[[:space:]]*ELF.*/\1/p}' | \ + xargs -r ldd | sed -nf /usr/lib/rpm/brp-rootfs.data/ldd.sed | \ + sed -n "/\/opt/s@^\([^:]\+\):.*\(/opt/[^[:blank:]]\+\).*@binary \1 is linked against libraries in /opt (\2)@" | \ + grep 'is linked against libraries in /opt' + } ; then + echo "" + echo "Please adjust the paths in your package" + echo + exit 1 fi exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140702.039494f/brp-45-tcl new/brp-check-suse-13.2+git20140727.d76b99d/brp-45-tcl --- old/brp-check-suse-13.2+git20140702.039494f/brp-45-tcl 2014-07-02 15:12:51.000000000 +0200 +++ new/brp-check-suse-13.2+git20140727.d76b99d/brp-45-tcl 2014-07-27 09:40:17.000000000 +0200 @@ -12,8 +12,8 @@ # Check for files named tclIndex and pkgIndex.tcl # under /usr/lib and /usr/lib64. -DIRS="$RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT/usr/lib64" -FILES=$(find $DIRS -maxdepth 2 -name pkgIndex.tcl 2>/dev/null) +DIRS=( "$RPM_BUILD_ROOT/usr/lib" "$RPM_BUILD_ROOT/usr/lib64" ) +FILES=$(find "${DIRS[@]}" -maxdepth 2 -name pkgIndex.tcl 2>/dev/null) if test -n "$FILES"; then echo "Script libraries for Tcl extensions should be in" echo "a package-specific subdir of /usr/share/tcl but" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140702.039494f/brp-50-check-python new/brp-check-suse-13.2+git20140727.d76b99d/brp-50-check-python --- old/brp-check-suse-13.2+git20140702.039494f/brp-50-check-python 2014-07-02 15:12:51.000000000 +0200 +++ new/brp-check-suse-13.2+git20140727.d76b99d/brp-50-check-python 2014-07-27 09:40:17.000000000 +0200 @@ -9,21 +9,19 @@ exit 0 fi -TMPDIR=`mktemp -d /tmp/ssizecheck-XXXXXX` +TMPDIR="$(mktemp -d /tmp/ssizecheck-XXXXXX)" find /usr/src/packages/BUILD/ -iname '**.c' -print0 | \ -xargs -r0 python /usr/lib/rpm/brp-check-python.data/ssizecheck.py > $TMPDIR/$$ +xargs -r0 python /usr/lib/rpm/brp-check-python.data/ssizecheck.py > "$TMPDIR/$$" test -f /.buildenv && . /.buildenv -cat $TMPDIR/$$ +cat "$TMPDIR/$$" if [ "${BUILD_BASENAME:0:4}" = "beta" ]; then - #echo "this is now an error in BETA (and will very soon be in STABLE)" - test -s $TMPDIR/$$ && echo "please see http://www.python.org/dev/peps/pep-0353/ for hints" - #test -s $TMPDIR/$$ && exit 1 + test -s "$TMPDIR/$$" && echo "please see http://www.python.org/dev/peps/pep-0353/ for hints" fi -rm -rf $TMPDIR +rm -rf "$TMPDIR" exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140702.039494f/brp-60-hook new/brp-check-suse-13.2+git20140727.d76b99d/brp-60-hook --- old/brp-check-suse-13.2+git20140702.039494f/brp-60-hook 2014-07-02 15:12:51.000000000 +0200 +++ new/brp-check-suse-13.2+git20140727.d76b99d/brp-60-hook 2014-07-27 09:40:17.000000000 +0200 @@ -4,8 +4,8 @@ exit 0 fi -if [ -e $RPM_SOURCE_DIR/brp-hook ] ; then - sh $RPM_SOURCE_DIR/brp-hook || exit 1 +if [ -e "$RPM_SOURCE_DIR/brp-hook" ] ; then + sh "$RPM_SOURCE_DIR/brp-hook" || exit 1 fi exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140702.039494f/brp-desktop.data/xdg_menu new/brp-check-suse-13.2+git20140727.d76b99d/brp-desktop.data/xdg_menu --- old/brp-check-suse-13.2+git20140702.039494f/brp-desktop.data/xdg_menu 2014-07-02 15:12:51.000000000 +0200 +++ new/brp-check-suse-13.2+git20140727.d76b99d/brp-desktop.data/xdg_menu 2014-07-27 09:40:17.000000000 +0200 @@ -1831,8 +1831,8 @@ if ($desktop->{'OnlyShowIn'} eq "GNOME") { $xtrapath .= ",icons/gnome"; } - my @out = `find \$RPM_BUILD_ROOT{/usr,/opt/kde3,/opt/gnome}/share/{pixmaps,icons/hicolor$xtrapath}{,{16x16,22x22,24x24,32x32,36x36,48x48,64x64,72x72,96x96,128x128,192x192,scalable}/{actions,animations,apps,categories,devices,emblems,emotes,filesystems,intl,mimetypes,places,status,stock}} -name $desktop->{Icon} -o -name $desktop->{Icon}.png -o -name $desktop->{Icon}.jpg -o -name $desktop->{Icon}.xpm -o -name $desktop->{Icon}.svg -o -name $desktop->{Icon}.svgz 2> /dev/null`; - @out = `find {/usr,/opt/kde3,/opt/gnome}/share/{pixmaps,icons/hicolor$xtrapath}{,{16x16,22x22,24x24,32x32,36x36,48x48,64x64,72x72,96x96,128x128,192x192,scalable}/{actions,animations,apps,categories,devices,emblems,emotes,filesystems,intl,mimetypes,places,status,stock}} -name $desktop->{Icon} -o -name $desktop->{Icon}.png -o -name $desktop->{Icon}.jpg -o -name $desktop->{Icon}.xpm -o -name $desktop->{Icon}.svg -o -name $desktop->{Icon}.svgz 2> /dev/null` unless @out; + my @out = `find \$RPM_BUILD_ROOT{/usr,/opt/kde3,/opt/gnome}/share/{pixmaps,icons/hicolor,icons/Adwaita$xtrapath}{,{16x16,22x22,24x24,32x32,36x36,48x48,64x64,72x72,96x96,128x128,192x192,scalable}/{actions,animations,apps,categories,devices,emblems,emotes,filesystems,intl,mimetypes,places,status,stock}} -name $desktop->{Icon} -o -name $desktop->{Icon}.png -o -name $desktop->{Icon}.jpg -o -name $desktop->{Icon}.xpm -o -name $desktop->{Icon}.svg -o -name $desktop->{Icon}.svgz 2> /dev/null`; + @out = `find {/usr,/opt/kde3,/opt/gnome}/share/{pixmaps,icons/hicolor,icons/Adwaita$xtrapath}{,{16x16,22x22,24x24,32x32,36x36,48x48,64x64,72x72,96x96,128x128,192x192,scalable}/{actions,animations,apps,categories,devices,emblems,emotes,filesystems,intl,mimetypes,places,status,stock}} -name $desktop->{Icon} -o -name $desktop->{Icon}.png -o -name $desktop->{Icon}.jpg -o -name $desktop->{Icon}.xpm -o -name $desktop->{Icon}.svg -o -name $desktop->{Icon}.svgz 2> /dev/null` unless @out; if ( !@out and $desktop->{'X-SuSE-YaST-Call'} eq '' ){ $output .= "ERROR: Icon file not installed: $desktop->{file} ($desktop->{Icon})\n"; $validate_error = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140702.039494f/brp-rootfs.data/ldd.sed new/brp-check-suse-13.2+git20140727.d76b99d/brp-rootfs.data/ldd.sed --- old/brp-check-suse-13.2+git20140702.039494f/brp-rootfs.data/ldd.sed 1970-01-01 01:00:00.000000000 +0100 +++ new/brp-check-suse-13.2+git20140727.d76b99d/brp-rootfs.data/ldd.sed 2014-07-27 09:40:17.000000000 +0200 @@ -0,0 +1,31 @@ +# for binary +/^[^[:blank:]]/{ + # push binary to hold space + x + # print old contents of hold space if it is not empty (remove newlines) + s/\n/ /gp + # and delete it + d +} + +# for dependency +/^[[:blank:]]/{ + # ignore linux-vdso.so.1 + /linux-vdso.so.1/d + # remove address + s/[[:blank:]]\+(0x[0-9a-f]\+)[[:blank:]]*$// + # remove library name without path + s@^[[:blank:]]\+[^[:blank:]]\+ => @@ + # append to hold space + H + # and delete contents (not d because of last line) + s/^.*$// +} + +# when processing last line I need to flush +${ + H + x + s/\n/ /gp +} +#:end -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
