diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 7dfcc9b..92ee3f1 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -48,7 +48,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.12.99.903 -Release: 1%{?gitdate:.%{gitdate}}%{dist} +Release: 2%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -101,9 +101,6 @@ Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch # needed when building without xorg (aka s390x) Patch7017: xserver-1.12.2-xorg-touch-test.patch -# print newline on -displayfd (824594) -Patch7018: xserver-1.12-os-print-newline-after-printing-display-name.patch - # send keycode/event type for slow keys enable (#816764) Patch7020: xserver-1.12-xkb-fill-in-keycode-and-event-type-for-slow-keys-ena.patch @@ -573,6 +570,10 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Thu Jul 26 2012 Peter Hutterer 1.12.99.903-2 +- xserver-1.12-os-print-newline-after-printing-display-name.patch: drop, + 014ad46f1b353a95e2c4289443ee857cfbabb3ae + * Thu Jul 26 2012 Dave Airlie 1.12.99.903-1 - rebase to 1.12.99.903 snapshot diff --git a/xserver-1.12-os-print-newline-after-printing-display-name.patch b/xserver-1.12-os-print-newline-after-printing-display-name.patch deleted file mode 100644 index 5d73645..0000000 --- a/xserver-1.12-os-print-newline-after-printing-display-name.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9d1c39b2115d3e7a403715083a584818f10feba2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 21 Jun 2012 14:26:15 +1000 -Subject: [PATCH] os: print newline after printing display name - -Much easier for scripts that try to read the display value off the file -descriptor. Plus, this restores the behaviour we had for this patch in -Fedora since server 1.6 (April 2009). - -Signed-off-by: Peter Hutterer ---- - os/connection.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/os/connection.c b/os/connection.c -index 039942f..5144d16 100644 ---- a/os/connection.c -+++ b/os/connection.c -@@ -423,7 +423,7 @@ CreateWellKnownSockets(void) - } - if (!found) - FatalError("Failed to find a socket to listen on"); -- snprintf(dynamic_display, sizeof(dynamic_display), "%d", i); -+ snprintf(dynamic_display, sizeof(dynamic_display), "%d\n", i); - display = dynamic_display; - } - --- -1.7.10.2 -