Author: jsmeix Date: Wed Apr 9 14:44:59 2008 New Revision: 46283 URL: http://svn.opensuse.org/viewcvs/yast?rev=46283&view=rev Log: - 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. Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp trunk/scanner/yast2-scanner.spec.in Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=46283&r1=46282&r2=46283&view=diff ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Wed Apr 9 14:44:59 2008 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=46283&r1=46282&r2=46283&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Wed Apr 9 14:44:59 2008 @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +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. + +------------------------------------------------------------------- Wed Mar 26 12:34:13 CET 2008 - jsmeix@suse.de - V 2.16.3 Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=46283&r1=46282&r2=46283&view=diff ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Wed Apr 9 14:44:59 2008 @@ -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 Modified: trunk/scanner/yast2-scanner.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/yast2-scanner.spec.in?rev=46283&r1=46282&r2=46283&view=diff ============================================================================== --- trunk/scanner/yast2-scanner.spec.in (original) +++ trunk/scanner/yast2-scanner.spec.in Wed Apr 9 14:44:59 2008 @@ -4,6 +4,9 @@ @HEADER@ 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: Configuration of scanner @@ -15,6 +18,13 @@ @BUILD@ @INSTALL@ +# 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@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org