diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index a8b7d1f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: libXres
-# $Id: Makefile,v 1.1 2005/08/26 21:36:59 mharris Exp $
-NAME := libXres
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/libXres.spec b/libXres.spec
index 9eba051..4a77773 100644
--- a/libXres.spec
+++ b/libXres.spec
@@ -1,7 +1,7 @@
 Summary: X-Resource extension client library
 Name: libXres
-Version: 1.0.3
-Release: 9%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,9 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xext)
 
 %description
 X-Resource is an extension that allows a client to query
@@ -21,7 +19,6 @@ the X server about its usage of various resources.
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 X.Org X11 libXres development package
@@ -29,20 +26,14 @@ X.Org X11 libXres 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 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,15 +53,15 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/extensions/XRes.h
-%if %{with_static}
-%{_libdir}/libXRes.a
-%endif
 %{_libdir}/libXRes.so
 %{_libdir}/pkgconfig/xres.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax@redhat.com> 1.0.4-1
+- libXres 1.0.4
+
 * Thu Aug 13 2009 Parag <paragn@fedoraproject.org> 1.0.3-9
 - Merge-review cleanups #226086
 
diff --git a/sources b/sources
index f3164b9..553f988 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de66ffb657aba64c9d6dbdeabb757f3e  libXres-1.0.3.tar.bz2
+4daf91f93d924e693f6f6ed276791be2  libXres-1.0.4.tar.bz2