Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Tue Nov 30 15:42:51 CET 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-11-25 18:43:12.000000000 +0100
+++ xorg-x11/xorg-x11.changes 2010-11-27 03:41:30.000000000 +0100
@@ -1,0 +2,8 @@
+Sat Nov 27 02:28:46 UTC 2010 - sndirsch@novell.com
+
+- xcalc 1.0.4.1
+ * This brown-paper-bag release just rebuilds the tarballs to
+ include the correct install-sh from the autotools instead of
+ the broken one in the 1.0.4 tarballs. Sorry about that.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xcalc-1.0.4.tar.bz2
New:
----
xcalc-1.0.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.qxZAlX/_old 2010-11-30 15:42:30.000000000 +0100
+++ /var/tmp/diff_new_pack.qxZAlX/_new 2010-11-30 15:42:30.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: bison
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 34
+Release: 35
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -62,7 +62,7 @@
Source27: x11perf-1.5.2.tar.bz2
Source28: xauth-1.0.5.tar.bz2
Source29: xbiff-1.0.2.tar.bz2
-Source30: xcalc-1.0.4.tar.bz2
+Source30: xcalc-1.0.4.1.tar.bz2
Source31: xclipboard-1.1.1.tar.bz2
Source32: xclock-1.0.5.tar.bz2
Source33: xcmsdb-1.0.3.tar.bz2
++++++ xcalc-1.0.4.tar.bz2 -> xcalc-1.0.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.0.4/ChangeLog new/xcalc-1.0.4.1/ChangeLog
--- old/xcalc-1.0.4/ChangeLog 2010-11-25 00:58:39.000000000 +0100
+++ new/xcalc-1.0.4.1/ChangeLog 2010-11-26 22:56:02.000000000 +0100
@@ -1,3 +1,14 @@
+commit 2755eae3be5fc239da792c46a10426281ee77b85
+Author: Alan Coopersmith
+Date: Fri Nov 26 13:53:42 2010 -0800
+
+ xcalc 1.0.4.1
+
+ Just respinning the tarballs with the correct install-sh instead of the
+ broken copy accidentally included in the 1.0.4 tarballs.
+
+ Signed-off-by: Alan Coopersmith
+
commit 8245b9f8451b92a1aaa7a3520114a4afdd37c2e8
Author: Alan Coopersmith
Date: Wed Nov 24 15:58:04 2010 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.0.4/configure new/xcalc-1.0.4.1/configure
--- old/xcalc-1.0.4/configure 2010-11-25 00:58:26.000000000 +0100
+++ new/xcalc-1.0.4.1/configure 2010-11-26 22:55:29.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for xcalc 1.0.4.
+# Generated by GNU Autoconf 2.68 for xcalc 1.0.4.1.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -561,8 +561,8 @@
# Identity of this package.
PACKAGE_NAME='xcalc'
PACKAGE_TARNAME='xcalc'
-PACKAGE_VERSION='1.0.4'
-PACKAGE_STRING='xcalc 1.0.4'
+PACKAGE_VERSION='1.0.4.1'
+PACKAGE_STRING='xcalc 1.0.4.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1289,7 +1289,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xcalc 1.0.4 to adapt to many kinds of systems.
+\`configure' configures xcalc 1.0.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1359,7 +1359,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xcalc 1.0.4:";;
+ short | recursive ) echo "Configuration of xcalc 1.0.4.1:";;
esac
cat <<\_ACEOF
@@ -1468,7 +1468,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xcalc configure 1.0.4
+xcalc configure 1.0.4.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1679,7 +1679,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xcalc $as_me 1.0.4, which was
+It was created by xcalc $as_me 1.0.4.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2499,7 +2499,7 @@
# Define the identity of the package.
PACKAGE='xcalc'
- VERSION='1.0.4'
+ VERSION='1.0.4.1'
cat >>confdefs.h <<_ACEOF
@@ -5321,7 +5321,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xcalc $as_me 1.0.4, which was
+This file was extended by xcalc $as_me 1.0.4.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5387,7 +5387,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xcalc config.status 1.0.4
+xcalc config.status 1.0.4.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.0.4/configure.ac new/xcalc-1.0.4.1/configure.ac
--- old/xcalc-1.0.4/configure.ac 2010-11-25 00:57:51.000000000 +0100
+++ new/xcalc-1.0.4.1/configure.ac 2010-11-26 22:53:30.000000000 +0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xcalc], [1.0.4],
+AC_INIT([xcalc], [1.0.4.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xcalc])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.0.4/install-sh new/xcalc-1.0.4.1/install-sh
--- old/xcalc-1.0.4/install-sh 2010-11-20 19:54:55.000000000 +0100
+++ new/xcalc-1.0.4.1/install-sh 2010-11-26 22:55:30.000000000 +0100
@@ -136,17 +136,21 @@
-d) dir_arg=true;;
+ -g) chgrpcmd="$chgrpprog $2"
shift;;
+ --help) echo "$usage"; exit $?;;
-m) mode=$2
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
shift;;
+ -o) chowncmd="$chownprog $2"
shift;;
-s) stripcmd=$stripprog;;
@@ -156,10 +160,12 @@
-T) no_target_directory=true;;
+ --version) echo "$0 $scriptversion"; exit $?;;
--) shift
break;;
+ -*) echo "$0: invalid option: $1" >&2
exit 1;;
*) break;;
@@ -167,12 +173,15 @@
shift
done
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
@@ -206,12 +215,14 @@
else
u_plus_rw='% 200'
fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
u_plus_rw=
else
u_plus_rw=,u+rw
fi
+ cp_umask=$mode$u_plus_rw;;
esac
fi
@@ -229,7 +240,11 @@
dstdir_status=$?
else
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
+ echo "$0: $src does not exist." >&2
exit 1
fi
@@ -248,15 +263,19 @@
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
+ dst=$dstdir/`basename "$src"`
dstdir_status=0
else
# Prefer dirname, but fall back on a substitute if dirname fails.
dstdir=`
(dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$dst" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
@@ -291,12 +310,15 @@
# Create intermediate dirs using mode 755 as modified by the umask.
# This is like FreeBSD 'install' as of 1997-10-28.
umask=`umask`
+ case $stripcmd.$umask in
# Optimize common cases.
*[2367][2367]) mkdir_umask=$umask;;
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
*[0-7])
mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
`;;
*) mkdir_umask=$umask,go-w;;
esac
@@ -316,8 +338,11 @@
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
@@ -330,11 +355,14 @@
d????-?--*) different_mode=755;;
*) false;;
esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
+ rmdir "$tmpdir/d" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
@@ -346,6 +374,7 @@
if
$posix_mkdir && (
umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
@@ -376,11 +405,13 @@
do
test -z "$d" && continue
+ prefix=$prefix$d
if test -d "$prefix"; then
prefixes=
else
if $posix_mkdir; then
(umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
else
@@ -388,6 +419,7 @@
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
*) qprefix=$prefix;;
esac
+ prefixes="$prefixes '$qprefix'"
fi
fi
prefix=$prefix/
@@ -396,6 +428,7 @@
if test -n "$prefixes"; then
# Don't fail if two instances are running concurrently.
(umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
test -d "$dstdir" || exit 1
obsolete_mkdir_used=true
fi
@@ -403,19 +436,32 @@
fi
if test -n "$dir_arg"; then
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
# Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
#
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
@@ -424,12 +470,17 @@
eval "$initialize_posix_glob" &&
$posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
$posix_glob set +f &&
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
rm -f "$dsttmp"
else
# Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
@@ -442,12 +493,17 @@
# file should still install successfully.
{
test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
} ||
+ { echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
} &&
# Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org