Author: arekm Date: Thu Sep 6 20:49:16 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- catch errors
---- Files affected:
SOURCES:
rpm.macros (1.391 -> 1.392)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.391 SOURCES/rpm.macros:1.392
--- SOURCES/rpm.macros:1.391 Thu Sep 6 21:15:32 2007
+++ SOURCES/rpm.macros Thu Sep 6 22:49:11 2007
@@ -643,11 +643,11 @@
# X.org helper macros
%__xorg_abi_requires() Requires: xorg-xserver-server(%{expand:%1}-abi) =
%{expand:%{%{!?2:%{1}}%{?2}}}
#
-%xorg_xserver_ansic_abi %(awk '/#define ABI_ANSIC_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h)
-%xorg_xserver_extension_abi %(awk '/#define ABI_EXTENSION_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h)
-%xorg_xserver_font_abi %(awk '/#define ABI_FONT_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h)
-%xorg_xserver_videodrv_abi %(awk '/#define ABI_VIDEODRV_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h)
-%xorg_xserver_xinput_abi %(awk '/#define ABI_XINPUT_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h)
+%xorg_xserver_ansic_abi %(awk '/#define ABI_ANSIC_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h 2> /dev/null || echo ERROR)
+%xorg_xserver_extension_abi %(awk '/#define ABI_EXTENSION_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h 2> /dev/null || echo ERROR)
+%xorg_xserver_font_abi %(awk '/#define ABI_FONT_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h 2> /dev/null | echo ERROR)
+%xorg_xserver_videodrv_abi %(awk '/#define ABI_VIDEODRV_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h 2> /dev/null || echo ERROR)
+%xorg_xserver_xinput_abi %(awk '/#define ABI_XINPUT_VERSION/ {
split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }'
/usr/include/xorg/xf86Module.h 2> /dev/null || echo ERROR)
%requires_xorg_xserver_extension %{__xorg_abi_requires ansic
xorg_xserver_ansic_abi} \
%{__xorg_abi_requires extension xorg_xserver_extension_abi}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.391&r2=1.392&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
