From 1f1feb7ff82f163b84ef77f076597f86e379f02c Mon Sep 17 00:00:00 2001
From: dogsheng <960055655@qq.com>
Date: Fri, 13 Dec 2019 15:42:19 +0800
Subject: [PATCH] Package init

---
 libX11.spec | 56 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/libX11.spec b/libX11.spec
index e5a288a..45c1844 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,17 +1,21 @@
-Name:           libX11
-Version:        1.6.7
-Release:        2
-License:        MIT
-Summary:        Core X11 protocol client library
-URL:            https://www.x.org
-Source0:        https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
-Patch0:         dont-forward-keycode-0.patch
+Name:		libX11
+Version:	1.6.9
+Release:	2
+Summary:	Core X11 protocol client library
+License:	MIT
+URL:		http://www.x.org
+Source0:	https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires:  xorg-x11-util-macros xorg-x11-proto-devel  libXdmcp-devel
-BuildRequires:  xorg-x11-xtrans-devel libxcb-devel libXau-devel perl-Pod-Usage
+Patch1:         dont-forward-keycode-0.patch
 
-Provides:       libX11-common libX11-xcb
-Obsoletes:      libX11-common libX11-xcb
+BuildRequires:	xorg-x11-util-macros >= 1.11 xorg-x11-proto-devel perl-Pod-Usage libXau-devel
+BuildRequires:  libxcb-devel >= 1.2 libXdmcp-devel xorg-x11-xtrans-devel >= 1.0.3-4
+
+Provides:       %{name}-common = %{version}-%{release}
+Obsoletes:      %{name}-common < %{version}-%{release}
+
+Provides:       %{name}-xcb = %{version}-%{release}
+Obsoletes:      %{name}-xcb < %{version}-%{release}
 
 %description
 Core X11 protocol client library.
@@ -34,9 +38,9 @@ autoreconf -ivf
 %make_build
 
 %install
-%make_install INSTALL="install -p"
-mkdir -p $RPM_BUILD_ROOT/var/cache/libX11/compose
+%make_install
 
+mkdir -p $RPM_BUILD_ROOT/var/cache/libX11/compose
 %delete_la
 
 %check
@@ -46,12 +50,14 @@ make %{?_smp_mflags} check
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS 
+%doc AUTHORS
 %license COPYING
+%{_libdir}/*.so.*
 %{_datadir}/X11/locale/*
 %{_datadir}/X11/XErrorDB
 %dir /var/cache/libX11/compose
-%{_libdir}/*.so.*
+%exclude %{_docdir}/*
+%exclude %{_datadir}/X11/Xcms.txt
 
 %files          devel
 %defattr(-,root,root)
@@ -59,16 +65,26 @@ make %{?_smp_mflags} check
 %{_libdir}/*.so
 %{_includedir}/X11/*.h
 %{_libdir}/pkgconfig/*.pc
+%exclude %{_includedir}/X11/extensions/XKBgeom.h
 
 %files          help
 %defattr(-,root,root)
-%doc README NEWS
+%doc README.md NEWS ChangeLog
 %{_mandir}/*/*
 
-%exclude %{_docdir}
-%exclude %{_datadir}/X11/Xcms.txt
-
 %changelog
+* Mon Nov 4 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.9-2
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:remove the XKBgeom.h
+
+* Fri Nov 1 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.9-1
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:update to 1.6.9
+
 * Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.7-2
 - Type:bugfix
 - Id:NA