SPECS: xorg-xserver-server.spec - allow errors to be catched by shell

[glen]

Author: glen                         Date: Tue Jan  8 07:32:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- allow errors to be catched by shell

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.120 -> 1.121) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.120 SPECS/xorg-xserver-server.spec:1.121
--- SPECS/xorg-xserver-server.spec:1.120	Wed Dec 12 23:29:37 2007
+++ SPECS/xorg-xserver-server.spec	Tue Jan  8 08:32:19 2008
@@ -274,7 +274,7 @@
 Provides:	xorg-xserver-modules-libglx
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
-%if !%{with multigl}
+%if %{without multigl}
 Conflicts:	xorg-driver-video-nvidia
 %endif
 
@@ -299,32 +299,32 @@
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
 
 %build
-if API=$(awk '/#define ABI_ANSIC_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
-	[ $API != %{xorg_xserver_server_ansic_abi} ]; then
-        echo "Set %%define xorg_xserver_server_ansic_abi to $API and rerun."
-        exit 1
+API=$(awk '/#define ABI_ANSIC_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_ansic_abi} ]; then
+	echo "Set %%define xorg_xserver_server_ansic_abi to $API and rerun."
+	exit 1
 fi
 
-if API=$(awk '/#define ABI_EXTENSION_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
-        [ $API != %{xorg_xserver_server_extension_abi} ]; then
-        echo "Set %%define xorg_xserver_server_extension_abi to $API and rerun."
-        exit 1
+API=$(awk '/#define ABI_EXTENSION_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_extension_abi} ]; then
+	echo "Set %%define xorg_xserver_server_extension_abi to $API and rerun."
+	exit 1
 fi
 
-if API=$(awk '/#define ABI_FONT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
-        [ $API != %{xorg_xserver_server_font_abi} ]; then
-        echo "Set %%define xorg_xserver_server_font_abi to $API and rerun."
-        exit 1
+API=$(awk '/#define ABI_FONT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_font_abi} ]; then
+	echo "Set %%define xorg_xserver_server_font_abi to $API and rerun."
+	exit 1
 fi
-if API=$(awk '/#define ABI_VIDEODRV_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
-        [ $API != %{xorg_xserver_server_videodrv_abi} ]; then
-        echo "Set %%define xorg_xserver_server_videodrv_abi to $API and rerun."
-        exit 1
+API=$(awk '/#define ABI_VIDEODRV_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_videodrv_abi} ]; then
+	echo "Set %%define xorg_xserver_server_videodrv_abi to $API and rerun."
+	exit 1
 fi
-if API=$(awk '/#define ABI_XINPUT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
-        [ $API != %{xorg_xserver_server_xinput_abi} ]; then
-        echo "Set %%define xorg_xserver_server_xinput_abi to $API and rerun."
-        exit 1
+API=$(awk '/#define ABI_XINPUT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_xinput_abi} ]; then
+	echo "Set %%define xorg_xserver_server_xinput_abi to $API and rerun."
+	exit 1
 fi
 
 %{__libtoolize}
@@ -503,6 +503,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2008-01-08 07:32:19  glen
+- allow errors to be catched by shell
+
 Revision 1.120  2007-12-12 22:29:37  arekm
 - up to 1.4.0.90 (1.4.1 preelease)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-xserver-server.spec?r1=1.120&r2=1.121&f=u