From 2d40a9da5bb953380b556dae2e06c8f9e4aeeec3 Mon Sep 17 00:00:00 2001
From: pnemade <pnemade@fedoraproject.org>
Date: Tue, 15 Jan 2008 06:52:19 +0000
Subject: [PATCH] - Merge-Review #226093 - Removed XFree86-libs, xorg-x11-libs
 XFree86-devel, xorg-x11-devel as     Obsoletes - Removed BR:pkgconfig -
 Removed zero-length README file

---
 libXv.spec | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/libXv.spec b/libXv.spec
index 564ebde..0b0fd98 100644
--- a/libXv.spec
+++ b/libXv.spec
@@ -1,21 +1,18 @@
 Summary: X.Org X11 libXv runtime library
 Name:    libXv
 Version: 1.0.3
-Release: 3%{?dist}
-License: MIT/X11
+Release: 4%{?dist}
+License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 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
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
-Obsoletes: XFree86-libs, xorg-x11-libs
-
 %description
 X.Org X11 libXv runtime library
 
@@ -26,12 +23,10 @@ Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
 # NOTE: libXext-devel dependency added to fix bug #192167
-Requires: libXext-devel
+Requires: libXext-devel pkgconfig
 # needed by xv.pc
 Requires: xorg-x11-proto-devel
 
-Obsoletes: XFree86-devel, xorg-x11-devel
-
 %description devel
 X.Org X11 libXv development package
 
@@ -44,9 +39,9 @@ X.Org X11 libXv development package
 %build
 %configure \
 %if ! %{with_static}
-	--disable-static
+  --disable-static
 %endif
-make
+make %{?_smp_mflags}
 
 %install
 
@@ -64,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING ChangeLog
 %{_libdir}/libXv.so.1
 %{_libdir}/libXv.so.1.0.0
 
@@ -82,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 15 2008 parag <paragn@fedoraproject.org> - 1.0.3-4
+- Merge-Review #226093
+- Removed XFree86-libs, xorg-x11-libs XFree86-devel, xorg-x11-devel as Obsoletes
+- Removed BR:pkgconfig
+- Removed zero-length README file
+
 * Tue Aug 21 2007 Adam Jackson <ajax@redhat.com> - 1.0.3-3
 - Rebuild for build id