- Merge-Review #226077

- Removed XFree86-libs, xorg-x11-libs XFree86-devel, xorg-x11-devel as
    Obsoletes
- Removed BR:pkgconfig
- Removed zero-length AUTHORS README file

libxkbfile.spec

@@ -1,20 +1,17 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
 Version: 1.0.4
-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/libxkbfile/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 
-Obsoletes: XFree86-libs, xorg-x11-libs
-
 %description
 X.Org X11 libxkbfile runtime library
 
@@ -23,12 +20,11 @@ Summary: X.Org X11 libxkbfile development package
 Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig 
 
 # needed by xkbfile.pc
 BuildRequires: xorg-x11-proto-devel
 
-Obsoletes: XFree86-devel, xorg-x11-devel
-
 %description devel
 X.Org X11 libxkbfile development package
 
@@ -46,7 +42,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %if ! %{with_static}
 	--disable-static
 %endif
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc COPYING ChangeLog
 %{_libdir}/libxkbfile.so.1
 %{_libdir}/libxkbfile.so.1.0.2
 
@@ -85,6 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Tue Jan 15 2008 parag <paragn@fedoraproject.org> - 1.0.4-4
+- Merge-Review #226077
+- Removed XFree86-libs, xorg-x11-libs XFree86-devel, xorg-x11-devel as Obsoletes
+- Removed BR:pkgconfig
+- Removed zero-length AUTHORS README file
+
 * Tue Aug 21 2007 Adam Jackson <ajax@redhat.com> - 1.0.4-3
 - Rebuild for build id