From 957ea6e954763b39c29cf8fa9eaeffdb0a1386290e491383330060ddccc5c8e7 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 13 Sep 2013 10:19:12 +0000
Subject: [PATCH] Accepting request 198764 from home:Zaitor:branches:X11:XOrg

Update to ver 1.1.0

OBS-URL: https://build.opensuse.org/request/show/198764
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xrdb?expand=0&rev=4
---
 xrdb-1.0.9.tar.bz2 |  3 ---
 xrdb-1.1.0.tar.bz2 |  3 +++
 xrdb.changes       | 26 ++++++++++++++++++++++++++
 xrdb.spec          | 12 +++++++-----
 4 files changed, 36 insertions(+), 8 deletions(-)
 delete mode 100644 xrdb-1.0.9.tar.bz2
 create mode 100644 xrdb-1.1.0.tar.bz2

diff --git a/xrdb-1.0.9.tar.bz2 b/xrdb-1.0.9.tar.bz2
deleted file mode 100644
index 5ee614b..0000000
--- a/xrdb-1.0.9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:642401e12996efe3e5e5307a245e24c282b94a44c1f147e177c8484b862aeab7
-size 118971
diff --git a/xrdb-1.1.0.tar.bz2 b/xrdb-1.1.0.tar.bz2
new file mode 100644
index 0000000..c978af0
--- /dev/null
+++ b/xrdb-1.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b
+size 138035
diff --git a/xrdb.changes b/xrdb.changes
index 9e574a8..d15af39 100644
--- a/xrdb.changes
+++ b/xrdb.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu Sep 12 19:26:22 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 1.1.0:
+  + Add -version flag to print package version string from
+    autoconf.
+  + Only add -P flag if using cpp as our preprocessor (fdo#34546).
+  + Predefined cpp macros can produce unexpected results
+    (fdo#3413).
+  + Rename args to several functions to not shadow global
+    variables.
+  + Mark fatal() & Syntax() with printf & noreturn attributes.
+  + Strip trailing whitespace.
+  + Remove unnecessary casts from malloc & realloc calls.
+  + Fix many const pointer warnings.
+  + Ensure we don't read out of ClassName array bounds for unknown
+    visual type (deb#488535).
+  + Clarify .Xresources vs. .Xdefaults in man page (deb#649187).
+  + Allow the CPP macro to contain preprocessors with command line
+    options (v2).
+  + Usage: In usage message print preprocessor that's actually
+    chosen.
+  + Fix build with WIN32 defined, but PATHETICCPP not defined.
+  + Tokenize #define names in the PATHETICCPP case too.
+- Add pkgconfig(xproto) BuildRequires, new dependency.
+
 -------------------------------------------------------------------
 Sat Apr 14 15:55:03 UTC 2012 - dimstar@opensuse.org
 
diff --git a/xrdb.spec b/xrdb.spec
index a750103..af9a22e 100644
--- a/xrdb.spec
+++ b/xrdb.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xrdb
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           xrdb
-Version:        1.0.9
-Release:        1
-License:        MIT
+Version:        1.1.0
+Release:        0
 Summary:        X server resource database utility
-Url:            http://xorg.freedesktop.org/
+License:        MIT
 Group:          System/X11/Utilities
+Url:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xmuu)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
+BuildRequires:  pkgconfig(xproto) >= 7.0.17
 Requires:       cpp
 # This was part of the xorg-x11 package up to version 7.6
 Conflicts:      xorg-x11 <= 7.6