libxcb.spec

@@ -1,10 +1,14 @@
 Name:           libxcb
-Version:        1.16
+Version:        1.14
 Release:        1
 Summary:        A C binding to the X11 protocol
 License:        MIT
 URL:            https://xcb.freedesktop.org/
+<<<<<<< HEAD
 Source0:        https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.xz
+=======
+Source0:        https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.gz
+>>>>>>> a3cba188aee1d61f8793ac24b32c15ad148e4659
 
 # This is stolen straight from the pthread-stubs source:
 # http://cgit.freedesktop.org/xcb/pthread-stubs/blob/?id=6900598192bacf5fd9a34619b11328f746a5956d
@@ -42,15 +46,11 @@ Man pages and other related documents for %{name}.
 sed -i 's/pthread-stubs //' configure.ac
 autoreconf -ivf
 %configure --docdir=%{_docdir}/%{name}-%{version} --enable-selinux \
-           --enable-xkb --enable-xinput --disable-xprint --disable-silent-rules \
+           --enable-xkb --enable-xinput --disable-xprint --disable-silent-rules
-	   --enable-unit-tests --disable-static
 
 %disable_rpath
 %make_build
 
-%check
-make check
-
 %install
 %make_install
 install -pm 644 COPYING NEWS README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -60,6 +60,9 @@ sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefi
 %delete_la
 %ldconfig_scriptlets
 
+%check
+make check
+
 %files
 %defattr(-,root,root)
 %{_docdir}/%{name}-%{version}/COPYING
@@ -69,6 +72,7 @@ sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefi
 %defattr(-,root,root)
 %{_includedir}/xcb
 %{_libdir}/*.so
+%{_libdir}/*.a
 %{_libdir}/pkgconfig/*.pc
 
 %files          help
@@ -78,16 +82,11 @@ sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefi
 %exclude %{_docdir}/%{name}-%{version}/COPYING
 
 %changelog
-* Thu Dec 28 2023 Paul Thomas <paulthomas100199@gmail.com> - 1.16-1
+<<<<<<< HEAD
-- update to version 1.16
+* Mon Jul 31 2020 chxssg<chxssg@qq.com> - 1.14-1
-
+=======
-* Thu Oct 27 2022 wangkerong <wangkerong@h-partners.com> - 1.15-1
+* Mon Jul 27 2020 chxssg<chxssg@qq.com> - 1.14-1
-- upgrade to 1.15
+>>>>>>> a3cba188aee1d61f8793ac24b32c15ad148e4659
-
-* Sun Apr 24 2022 yangcheng <yangcheng87@h-partners.com> - 1.14-2
-- enable check while building
-
-* Fri Jul 31 2020 chxssg<chxssg@qq.com> - 1.14-1
 - update package to 1.14 
 
 * Tue Sep 03 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.13.1-2