From 356b9b4f67ddf0cb361154df14ee506be1df2a381ac5414c98821cc9a8f240f2 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sun, 15 Apr 2012 10:52:00 +0000
Subject: [PATCH] Accepting request 113636 from home:dimstar:branches:X11:XOrg

Update to 1.3.2

OBS-URL: https://build.opensuse.org/request/show/113636
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=2
---
 xinit-1.3.0.tar.bz2 |  3 ---
 xinit-1.3.2.tar.bz2 |  3 +++
 xinit.changes       | 32 ++++++++++++++++++++++++++++++++
 xinit.diff          | 12 +++++++-----
 xinit.spec          |  4 ++--
 5 files changed, 44 insertions(+), 10 deletions(-)
 delete mode 100644 xinit-1.3.0.tar.bz2
 create mode 100644 xinit-1.3.2.tar.bz2

diff --git a/xinit-1.3.0.tar.bz2 b/xinit-1.3.0.tar.bz2
deleted file mode 100644
index 9542bfb..0000000
--- a/xinit-1.3.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c
-size 138315
diff --git a/xinit-1.3.2.tar.bz2 b/xinit-1.3.2.tar.bz2
new file mode 100644
index 0000000..0572702
--- /dev/null
+++ b/xinit-1.3.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235
+size 148443
diff --git a/xinit.changes b/xinit.changes
index 1849113..7d4d5ff 100644
--- a/xinit.changes
+++ b/xinit.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Sat Apr 14 22:02:54 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 1.3.2:
+  + Use default clientargs, serverargs, and display if none were
+    set
+  + launchd: Add an option (--with-launchagent-xserver) to set the
+    default X11 server
+  + startx: Choose an unused $DISPLAY by default on all platforms
+    (fdo#1789)
+  + Include <sys/time.h> and <sys/resource.h> unconditionally
+    (fdo#40632)
+  + darwin: Buildfix for Tiger which doesn't have posix_spawn
+- Changes from version 1.3.1:
+  + launchd: Brownbag fix string compare
+  + launchd: console_redirect: Actually read and log the remaining
+    data when we get EV_EOF
+  + launchd: Enable stdout/stderr redirection to ASL
+  + launchd: Fix an array-index-out-of-bounds crasher
+  + launchd: Log messages to ASL rather than fprintf
+  + launchd: Reorganized layout of launchd sources
+  + launchd: Set the correct id for privileged_startx
+  + launchd: Silence clang static analyzer
+  + launchd: syslog: Use facility org.x rather than user
+  + launchd: Update console redirection to work with libdispatch
+  + privileged_startx: Prefer /usr/bin/mktemp
+  + Rename launchd-id-prefix to bundle-id-prefix
+  + Use XORG_MANPAGE_SECTIONS rather than cpprules.in to build man
+    pages
+  + Build system fixes.
+- Rebase xinit.diff.
+
 -------------------------------------------------------------------
 Fri Apr 13 08:46:08 UTC 2012 - vuntz@opensuse.org
 
diff --git a/xinit.diff b/xinit.diff
index 35b8711..a5ceb33 100644
--- a/xinit.diff
+++ b/xinit.diff
@@ -1,8 +1,10 @@
---- Makefile.am.orig	2010-03-15 23:35:56.000000000 +0100
-+++ Makefile.am	2010-09-05 12:29:21.000000000 +0200
-@@ -19,6 +19,8 @@
- #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- #  PERFORMANCE OF THIS SOFTWARE.
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
+@@ -24,6 +24,8 @@ if LAUNCHD
+ SUBDIRS += launchd
+ endif
  
 +XINITDIR = /etc/X11/xinit
 +
diff --git a/xinit.spec b/xinit.spec
index 47deb09..4e3bf67 100644
--- a/xinit.spec
+++ b/xinit.spec
@@ -16,8 +16,8 @@
 #
 
 Name:           xinit
-Version:        1.3.0
-Release:        0
+Version:        1.3.2
+Release:        1
 License:        MIT
 Summary:        X Window System initializer
 Url:            http://xorg.freedesktop.org/