SOURCES: rpm.macros - no %{_includedir} macro, it could be redefin...

[glen]

Author: glen                         Date: Thu Sep  6 19:15:37 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- no %{_includedir} macro, it could be redefined in spec

---- Files affected:
SOURCES:
   rpm.macros (1.390 -> 1.391) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.390 SOURCES/rpm.macros:1.391
--- SOURCES/rpm.macros:1.390	Thu Sep  6 21:11:43 2007
+++ SOURCES/rpm.macros	Thu Sep  6 21:15:32 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]); }' %{_includedir}/xorg/xf86Module.h)
-%xorg_xserver_extension_abi	%(awk '/#define ABI_EXTENSION_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' %{_includedir}/xorg/xf86Module.h)
-%xorg_xserver_font_abi		%(awk '/#define ABI_FONT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' %{_includedir}/xorg/xf86Module.h)
-%xorg_xserver_videodrv_abi	%(awk '/#define ABI_VIDEODRV_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' %{_includedir}/xorg/xf86Module.h)
-%xorg_xserver_xinput_abi		%(awk '/#define ABI_XINPUT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' %{_includedir}/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)
+%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)
 
 %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.390&r2=1.391&f=u