Hello community,
here is the log from the commit of package yast2-scanner
checked in at Wed Apr 9 22:14:31 CEST 2008.
--------
--- yast2-scanner/yast2-scanner.changes 2008-03-26 19:06:46.000000000 +0100
+++ yast2-scanner/yast2-scanner.changes 2008-04-09 14:45:29.978698000 +0200
@@ -1,0 +2,16 @@
+Wed Apr 9 14:21:43 CEST 2008 - jsmeix@suse.de
+
+- V 2.16.4
+- Modified yast2-scanner.spec.in to exclude displaytest from the
+ files which are sent to /usr/lib/rpm/find-requires so that the
+ yast2-scanner RPM does no longer require X libraries (libX11,
+ libXau, libxcb, and libxcb-xlib) so that it can be installed
+ in a system without X.
+ Nevertheless it is still architecture dependant because of its
+ displaytest binary.
+ It does not matter if displaytest fails orderly because its
+ XOpenDisplay call fails or if it crashes because of missing
+ libraries. All what matters is that displaytest finds out
+ if a graphical window can be opened or not.
+
+-------------------------------------------------------------------
Old:
----
yast2-scanner-2.16.3.tar.bz2
New:
----
yast2-scanner-2.16.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.Yv5194/_old 2008-04-09 22:13:22.000000000 +0200
+++ /var/tmp/diff_new_pack.Yv5194/_new 2008-04-09 22:13:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.16.3)
+# spec file for package yast2-scanner (Version 2.16.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,15 +13,18 @@
Url: http://en.opensuse.org/YaST
Name: yast2-scanner
-Version: 2.16.3
+Version: 2.16.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.16.3.tar.bz2
+Source0: yast2-scanner-2.16.4.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files xorg-x11-libX11-devel yast2 yast2-devtools yast2-testsuite
Requires: yast2
+# Used to exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list
+# which are pulled in by Autoreqprov because of the displaytest tool:
+%define my_requires /tmp/my-requires
Summary: YaST2 - Scanner Configuration
%description
@@ -43,7 +46,7 @@
Johannes Meixner
%prep
-%setup -n yast2-scanner-2.16.3
+%setup -n yast2-scanner-2.16.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -62,6 +65,13 @@
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
+# Exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list
+# which are pulled in by Autoreqprov because of the displaytest tool:
+cat << EOF > %{my_requires}
+grep -v 'displaytest' | %{__find_requires}
+EOF
+chmod 755 %{my_requires}
+%define __find_requires %{my_requires}
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -77,6 +87,19 @@
%{prefix}/lib/YaST2/bin/displaytest
%doc %{prefix}/share/doc/packages/yast2-scanner
%changelog
+* Wed Apr 09 2008 jsmeix@suse.de
+- V 2.16.4
+- Modified yast2-scanner.spec.in to exclude displaytest from the
+ files which are sent to /usr/lib/rpm/find-requires so that the
+ yast2-scanner RPM does no longer require X libraries (libX11,
+ libXau, libxcb, and libxcb-xlib) so that it can be installed
+ in a system without X.
+ Nevertheless it is still architecture dependant because of its
+ displaytest binary.
+ It does not matter if displaytest fails orderly because its
+ XOpenDisplay call fails or if it crashes because of missing
+ libraries. All what matters is that displaytest finds out
+ if a graphical window can be opened or not.
* Wed Mar 26 2008 jsmeix@suse.de
- V 2.16.3
- Let "Restart Detection" toggle the autodetection behaviour
++++++ yast2-scanner-2.16.3.tar.bz2 -> yast2-scanner-2.16.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.16.3/configure new/yast2-scanner-2.16.4/configure
--- old/yast2-scanner-2.16.3/configure 2008-03-26 19:04:54.000000000 +0100
+++ new/yast2-scanner-2.16.4/configure 2008-04-09 14:42:53.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-scanner 2.16.3.
+# Generated by GNU Autoconf 2.61 for yast2-scanner 2.16.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-scanner'
PACKAGE_TARNAME='yast2-scanner'
-PACKAGE_VERSION='2.16.3'
-PACKAGE_STRING='yast2-scanner 2.16.3'
+PACKAGE_VERSION='2.16.4'
+PACKAGE_STRING='yast2-scanner 2.16.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1436,7 +1436,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 yast2-scanner 2.16.3 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.16.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1507,7 +1507,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-scanner 2.16.3:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.16.4:";;
esac
cat <<\_ACEOF
@@ -1613,7 +1613,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-scanner configure 2.16.3
+yast2-scanner configure 2.16.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1627,7 +1627,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-scanner $as_me 2.16.3, which was
+It was created by yast2-scanner $as_me 2.16.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2448,7 +2448,7 @@
# Define the identity of the package.
PACKAGE='yast2-scanner'
- VERSION='2.16.3'
+ VERSION='2.16.4'
cat >>confdefs.h <<_ACEOF
@@ -2675,7 +2675,7 @@
-VERSION="2.16.3"
+VERSION="2.16.4"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -22173,7 +22173,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-scanner $as_me 2.16.3, which was
+This file was extended by yast2-scanner $as_me 2.16.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22226,7 +22226,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-scanner config.status 2.16.3
+yast2-scanner config.status 2.16.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.16.3/configure.in new/yast2-scanner-2.16.4/configure.in
--- old/yast2-scanner-2.16.3/configure.in 2008-03-26 19:04:42.000000000 +0100
+++ new/yast2-scanner-2.16.4/configure.in 2008-04-09 14:42:41.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.16.3, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.16.4, http://bugs.opensuse.org/, yast2-scanner)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.3"
+VERSION="2.16.4"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.16.3/src/Scanner.ycp new/yast2-scanner-2.16.4/src/Scanner.ycp
--- old/yast2-scanner-2.16.3/src/Scanner.ycp 2008-03-26 19:06:15.000000000 +0100
+++ new/yast2-scanner-2.16.4/src/Scanner.ycp 2008-04-09 14:45:00.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Scanner settings, input and output functions
* Authors: Johannes Meixner
*
- * $Id: Scanner.ycp 45770 2008-03-26 18:06:14Z jsmeix $
+ * $Id: Scanner.ycp 46283 2008-04-09 12:44:59Z jsmeix $
*
* Representation of the configuration of scanner.
* Input and output routines.
@@ -1022,7 +1022,7 @@
return false;
}
if( ! ExecuteBashCommand( "/usr/lib/YaST2/bin/displaytest" ) )
- { // The file location is the same on i386, x86_64, ppc, ppc64, and ia64 (nowhere "lib64" or "lib32").
+ { // The file location is the same on i386, x86_64, ppc, ppc64, ia64, s390x (nowhere "lib64" or "lib32").
// In particular when YaST runs in text-only mode, hp-setup must not be launched
// because it would run without any contact to the user "in the background"
// while in the foreground YaST waits for hp-setup to be finished
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.16.3/VERSION new/yast2-scanner-2.16.4/VERSION
--- old/yast2-scanner-2.16.3/VERSION 2008-03-26 12:34:08.000000000 +0100
+++ new/yast2-scanner-2.16.4/VERSION 2008-04-08 16:35:01.000000000 +0200
@@ -1 +1 @@
-2.16.3
+2.16.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org