From 88eb91ae4b15d5a053883c7defe82646781370a4 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 13 Jan 2014 14:33:28 -0500 Subject: [PATCH] xserver 1.15.0 --- .gitignore | 1 + sources | 2 +- xorg-x11-server.spec | 11 ++++------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c319f6a..ae892e8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ xorg-server-1.9.1.tar.bz2 /xorg-server-1.14.99.902.tar.bz2 *.bz2 *.xz +/xorg-x11-server-1.15.0-1.fc21.src.rpm diff --git a/sources b/sources index 8ee216d..df30ce1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2f45a61a3cdf480c59d3f3dcc11bdc7 xorg-server-1.14.99.904.tar.bz2 +c2ace3697b32414094cf8c597c39d7d9 xorg-server-1.15.0.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index f6531f6..05f4122 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -41,7 +41,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.14.99.904 +Version: 1.15.0 Release: 1%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT @@ -74,12 +74,6 @@ Source31: xserver-sdk-abi-requires.git # maintainer convenience script Source40: driver-abi-rebuild.sh -# sync with tip -Patch0001: 0001-present-recursively-set-window-pixmaps-on-flip.patch - -# submitted -Patch0050: 0001-configure-Fix-a-typo-near-dri3-shmfence-detection.patch - # xwayland. trivial rebase onto master: # http://cgit.freedesktop.org/~ajax/xserver/log/?h=wayland-f21 Patch0101: 0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch @@ -639,6 +633,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Mon Jan 13 2014 Adam Jackson 1.15.0-1 +- xserver 1.15.0 + * Tue Dec 17 2013 Adam Jackson 1.14.99.904-1 - 1.15RC4 - Re-disable int10 on arm