From ee5c261e7aedb99c81fbd30ae70953f2b178c2bd Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Tue, 24 Jul 2007 17:40:17 +0000
Subject: [PATCH] libXcomposite 0.4.0

---
 .cvsignore         |  2 +-
 libXcomposite.spec | 24 +++++++++---------------
 sources            |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 219a36b..8270af3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXcomposite-0.3.1.tar.bz2
+libXcomposite-0.4.0.tar.bz2
diff --git a/libXcomposite.spec b/libXcomposite.spec
index c639a4b..e513f8f 100644
--- a/libXcomposite.spec
+++ b/libXcomposite.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
-Version: 0.3.1
-Release: 2
+Version: 0.4.0
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,7 +10,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel >= 7.0-10
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: compositeproto >= 0.4
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXfixes-devel
@@ -37,23 +38,15 @@ X.Org X11 libXcomposite development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
 
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make
 
 %install
 
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
-# We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -73,13 +66,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/Xcomposite.h
-%if %{with_static}
-%{_libdir}/libXcomposite.a
-%endif
 %{_libdir}/libXcomposite.so
 %{_libdir}/pkgconfig/xcomposite.pc
+%{_mandir}/man3/X?omposite*.3*
 
 %changelog
+* Tue Jul 24 2007 Adam Jackson <ajax@redhat.com> 0.4.0-1
+- libXcomposite 0.4.0
+
 * Sat Apr 21 2007 Matthias Clasen <mclasen@redhat.com> - 0.3.1-2
 - Don't install INSTALL
 
diff --git a/sources b/sources
index 3be3f59..4889fd4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a80650d660486ea7bb2e5fd84a83799a  libXcomposite-0.3.1.tar.bz2
+7e95395dea89be21bae929b9b7f16641  libXcomposite-0.4.0.tar.bz2