forked from pool/xorg-x11-server
Accepting request 953300 from X11:XOrg
OBS-URL: https://build.opensuse.org/request/show/953300 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=402
This commit is contained in:
commit
0b60dd6f9e
@ -12,11 +12,11 @@ extract_abi() {
|
|||||||
grep ^.define.*${1}_VERSION ${xorg_src}/hw/xfree86/common/xf86Module.h | tr '(),' ' .' | awk '{ print $4$5 }'
|
grep ^.define.*${1}_VERSION ${xorg_src}/hw/xfree86/common/xf86Module.h | tr '(),' ' .' | awk '{ print $4$5 }'
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ "$1" == "--tar" ]; then
|
if [ "$1" = "--tar" ]; then
|
||||||
tmpdir=$(mktemp -d)
|
tmpdir=$(mktemp -d)
|
||||||
tar xf "$2" -C ${tmpdir}
|
tar xf "$2" -C ${tmpdir}
|
||||||
xorg_src=${tmpdir}/*
|
xorg_src=${tmpdir}/*
|
||||||
elif [ "$1" == "--verify" ]; then
|
elif [ "$1" = "--verify" ]; then
|
||||||
xorg_src="$2"
|
xorg_src="$2"
|
||||||
prv_ext=".build"
|
prv_ext=".build"
|
||||||
else
|
else
|
||||||
@ -39,15 +39,18 @@ abi_videodrv=`extract_abi VIDEODRV`
|
|||||||
abi_xinput=`extract_abi XINPUT`
|
abi_xinput=`extract_abi XINPUT`
|
||||||
abi_extension=`extract_abi EXTENSION`
|
abi_extension=`extract_abi EXTENSION`
|
||||||
|
|
||||||
A="Provides: X11_ABI_XINPUT = ${abi_xinput}\nProvides: X11_ABI_VIDEODRV = ${abi_videodrv}\nProvides: X11_ABI_ANSIC = ${abi_ansic}\nProvides: X11_ABI_EXTENSION = ${abi_extension}"
|
cat > xorg-server-provides${prv_ext} <<EOF
|
||||||
|
Provides: X11_ABI_XINPUT = ${abi_xinput}
|
||||||
|
Provides: X11_ABI_VIDEODRV = ${abi_videodrv}
|
||||||
|
Provides: X11_ABI_ANSIC = ${abi_ansic}
|
||||||
|
Provides: X11_ABI_EXTENSION = ${abi_extension}
|
||||||
|
EOF
|
||||||
|
|
||||||
echo -e $A > xorg-server-provides${prv_ext}
|
if [ "$1" = "--tar" ]; then
|
||||||
|
|
||||||
if [ "$1" == "--tar" ]; then
|
|
||||||
if [ -d ${tmpdir} ]; then
|
if [ -d ${tmpdir} ]; then
|
||||||
rm -rf ${tmpdir}
|
rm -rf ${tmpdir}
|
||||||
fi
|
fi
|
||||||
elif [ "$1" == "--verify" ]; then
|
elif [ "$1" = "--verify" ]; then
|
||||||
diff "$3" xorg-server-provides${prv_ext}
|
diff "$3" xorg-server-provides${prv_ext}
|
||||||
if [ $? -gt 0 ]; then
|
if [ $? -gt 0 ]; then
|
||||||
echo "The ABI verification failed... please run $0 before checking in"
|
echo "The ABI verification failed... please run $0 before checking in"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
Provides: X11_ABI_XINPUT = 24.4
|
Provides: X11_ABI_XINPUT = 24.4
|
||||||
Provides: X11_ABI_VIDEODRV = 25.2
|
Provides: X11_ABI_VIDEODRV = 25.2
|
||||||
Provides: X11_ABI_ANSIC = 0.4
|
Provides: X11_ABI_ANSIC = 0.4
|
||||||
Provides: X11_ABI_EXTENSION = 10.0
|
Provides: X11_ABI_EXTENSION = 10.0
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 10 20:26:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- fix bashisms in pre_checkins.sh (bsc#1195391)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 3 21:03:34 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
Mon Jan 3 21:03:34 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user