From 7914ea82e64ce87d5fdd54681ac0b84483982374 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Wed, 22 Oct 2014 19:47:32 +0200
Subject: [PATCH] Update to 0.4.0.

- Modernize spec file.
- Include COPYING.
- Update requirements.
---
 .gitignore    |  1 +
 sources       |  2 +-
 xcb-util.spec | 38 +++++++++++++++-----------------------
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 516a600..2d0c0d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xcb-util-0.3.6.tar.bz2
 /xcb-util-0.3.8.tar.bz2
 /xcb-util-0.3.9.tar.bz2
+/xcb-util-0.4.0.tar.bz2
diff --git a/sources b/sources
index bbace73..2485692 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01dcc7a16d5020530552712710646ea2  xcb-util-0.3.9.tar.bz2
+2e97feed81919465a04ccc71e4073313  xcb-util-0.4.0.tar.bz2
diff --git a/xcb-util.spec b/xcb-util.spec
index bf69404..e9595a8 100644
--- a/xcb-util.spec
+++ b/xcb-util.spec
@@ -1,14 +1,12 @@
 Name:		xcb-util
-Version:	0.3.9
-Release:	5%{?dist}
+Version:	0.4.0
+Release:	1%{?dist}
 Summary:	Convenience libraries sitting on top of libxcb
-
 Group:		System Environment/Libraries
 License:	MIT
 URL:		http://xcb.freedesktop.org
 Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
-BuildRequires:	gperf, pkgconfig, libxcb-devel >= 1.4, m4, xorg-x11-proto-devel
-BuildRequires:	chrpath
+BuildRequires:	pkgconfig(xcb) >= 1.4
 
 
 %description
@@ -23,7 +21,8 @@ the X protocol but which have traditionally been provided by Xlib.
 %package 	devel
 Summary:	Development and header files for xcb-util
 Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}, pkgconfig
+Requires:	%{name}%{?isa} = %{version}-%{release}
+
 %description	devel
 Development files for xcb-util.
 
@@ -33,24 +32,16 @@ Development files for xcb-util.
 
 
 %build
-%configure --with-pic --disable-static
-
+%configure --with-pic --disable-static --disable-silent-rules
 make %{?_smp_mflags}
 
 
 %check
-
 make check
 
 
 %install
-rm -rf %{buildroot}
-
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-
-# remove RPATH
-chrpath --delete $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-*.so.*
-
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 rm %{buildroot}%{_libdir}/*.la
 
 
@@ -60,23 +51,24 @@ rm %{buildroot}%{_libdir}/*.la
 %postun -p /sbin/ldconfig
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
-%doc README
+%doc README COPYING NEWS
 %{_libdir}/libxcb-util.so.1*
 
+
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 %{_includedir}/xcb/*.h
 
 
 %changelog
+* Wed Oct 22 2014 Thomas Moschny <thomas.moschny@gmx.de> - 0.4.0-1
+- Update to 0.4.0.
+- Modernize spec file.
+- Include COPYING.
+- Update requirements.
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild