SPECS: xorg-xserver-server.spec - introduce ABI requires for track...

arekm arekm at pld-linux.org
Thu Sep 6 18:10:36 CEST 2007


Author: arekm                        Date: Thu Sep  6 16:10:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- introduce ABI requires for tracking module dependencies

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.97 -> 1.98) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.97 SPECS/xorg-xserver-server.spec:1.98
--- SPECS/xorg-xserver-server.spec:1.97	Thu Sep  6 17:29:57 2007
+++ SPECS/xorg-xserver-server.spec	Thu Sep  6 18:10:31 2007
@@ -85,11 +85,11 @@
 BuildRequires:	xorg-proto-xproto-devel
 BuildRequires:	xorg-util-util-macros >= 0.99.2
 # see hw/xfree86/common/xf86Module.h
-Provides:	xorg-xserver-server(ansic-abi) = 0.3
-Provides:	xorg-xserver-server(extension-abi) = 0.3
-Provides:	xorg-xserver-server(font-abi) = 0.5
-Provides:	xorg-xserver-server(videodrv-abi) = 2.0
-Provides:	xorg-xserver-server(xinput-abi) = 2.0
+Provides:	xorg-xserver-server(ansic-abi) = %{xorg_xserver_server_ansic_abi}
+Provides:	xorg-xserver-server(extension-abi) = %{xorg_xserver_server_extension_abi}
+Provides:	xorg-xserver-server(font-abi) = %{xorg_xserver_server_font_abi}
+Provides:	xorg-xserver-server(videodrv-abi) = %{xorg_xserver_server_videodrv_abi}
+Provides:	xorg-xserver-server(xinput-abi) = %{xorg_xserver_server_xinput_abi}
 # xcalibrateproto, tslib (for KDRIVE only)
 # glitz-devel >= 0.4.3 (for XGL and EGL only)
 # for rgb.txt
@@ -252,6 +252,12 @@
 %description -n xorg-xserver-libglx -l pl.UTF-8
 Biblioteka rozszerzenia GLX dla serwera X.org.
 
+%define	xorg_xserver_server_ansic_abi		0.3
+%define	xorg_xserver_server_extension_abi	0.3
+%define	xorg_xserver_server_font_abi		0.5
+%define	xorg_xserver_server_videodrv_abi	2.0
+%define	xorg_xserver_server_xinput_abi		2.0
+
 %prep
 %setup -q -a1 -n xorg-server-%{version}
 %patch0 -p1
@@ -265,6 +271,35 @@
 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
+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
+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
+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
+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
+fi
+
+
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -414,6 +449,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.98  2007/09/06 16:10:31  arekm
+- introduce ABI requires for tracking module dependencies
+
 Revision 1.97  2007/09/06 15:29:57  arekm
 - provide ABI versions for dynamic modules
 
================================================================

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



More information about the pld-cvs-commit mailing list