diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index bab09c8..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-libXext-1.0.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9c1ef18
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+libXext-1.0.4.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index bd4572f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Makefile for source rpm: libXext
-# $Id$
-NAME := libXext
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common
diff --git a/libXext.spec b/libXext.spec
index 44415fb..35717b5 100644
--- a/libXext.spec
+++ b/libXext.spec
@@ -1,21 +1,18 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
-Version: 1.0.1
-Release: 4%{?dist}
-License: MIT/X11
+Version: 1.0.4
+Release: 1%{?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 >= 7.1-10
 BuildRequires: libX11-devel
 BuildRequires: libXau-devel
 
-Obsoletes: XFree86-libs, xorg-x11-libs
-
 %description
 X.Org X11 libXext runtime library
 
@@ -25,11 +22,10 @@ Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
-Requires: libX11-devel
+Requires: libX11-devel pkgconfig
 # xorg-x11-proto-devel is needed by xext.pc
 Requires: xorg-x11-proto-devel >= 7.0-1
 
-Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXext development package
@@ -46,7 +42,7 @@ X.Org X11 libXext development package
 %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 AUTHORS COPYING ChangeLog
 %{_libdir}/libXext.so.6
 %{_libdir}/libXext.so.6.4.0
 
@@ -76,9 +72,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXext.so
 %{_libdir}/pkgconfig/xext.pc
 #%dir %{_mandir}/man3x
-%{_mandir}/man3/*.3x*
+%{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 29 2008 Adam Jackson <ajax@redhat.com> 1.0.4-1
+- libXext 1.0.4
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.1-6
+- Autorebuild for GCC 4.3
+
+* Tue Jan 15 2008 parag <paragn@fedoraproject.org> - 1.0.1-5
+- Merge-Review #226070
+- 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.1-4
 - Rebuild for build id
 
diff --git a/sources b/sources
index 3d9ca86..0758f70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7f3f752d291865108689c889d160ea0  libXext-1.0.1.tar.bz2
+a91f1f722ac80c597cf0b75dcb8b48c0  libXext-1.0.4.tar.bz2