diff --git a/.cvsignore b/.cvsignore index 2509440..6191f76 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-1.7.5.901.tar.bz2 +xorg-server-1.7.5.902.tar.bz2 diff --git a/sources b/sources index 27a4669..ec3339e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d436ce2f2239c196ee163c7c047c1dd2 xorg-server-1.7.5.901.tar.bz2 +47adb90279d3383cca2740cb31cb6510 xorg-server-1.7.5.902.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index de4282f..34ca627 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -18,8 +18,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.7.5.901 -Release: 4%{dist} +Version: 1.7.5.902 +Release: 1%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -90,9 +90,11 @@ Patch6075: xserver-1.7.4-qxl-autoconfig.patch # 516918 Patch6076: xserver-1.7.4-dpms-timeouts.patch -# Revert upstream, apply our own one. -Patch6077: xserver-1.7.5.901-revert-owner-events.patch +# 543647 Patch6078: xserver-1.7.4-owner-events.patch +# fix botched configure in 1.7.5.902, remove with 1.7.6 +Patch6079: xserver-1.7.5.902-sha-libs.patch + Patch7000: xserver-1.7.5-exa-mixed.patch @@ -526,6 +528,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Mon Mar 15 2010 Peter Hutterer 1.7.5.902-1 +- xerver 1.7.5.902 (1.7.6RC2) + * Tue Mar 09 2010 Peter Hutterer 1.7.5.901-4 - cvs add the patches... diff --git a/xserver-1.7.5.902-sha-libs.patch b/xserver-1.7.5.902-sha-libs.patch new file mode 100644 index 0000000..1a32e81 --- /dev/null +++ b/xserver-1.7.5.902-sha-libs.patch @@ -0,0 +1,29 @@ +From 5b4fabb910eefb393eb3bfb45df5e63fdeb71f26 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 15 Mar 2010 08:44:01 +1000 +Subject: [PATCH] configure: restore SHA1_LIB for XSERVER_SYS_LIBS + +Accidentally removed in ff5fb43a4b38c707a, caused by +a botched merge when cherry-picking 178da6534fe7ab4b99fb. + +Signed-off-by: Peter Hutterer +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2046157..c215b5c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1326,7 +1326,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) + # + XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" + XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB" +-XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}" ++XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}" + AC_SUBST([XSERVER_LIBS]) + AC_SUBST([XSERVER_SYS_LIBS]) + +-- +1.6.6.1 +