diff --git a/.cvsignore b/.cvsignore
index cc6a61e..6cc8e55 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xapian-core-1.2.0.tar.gz
+xapian-core-1.2.2.tar.gz
diff --git a/multilib-devel-conflict-fix.patch b/multilib-devel-conflict-fix.patch
deleted file mode 100644
index b4b833b..0000000
--- a/multilib-devel-conflict-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -upNr xapian-core-1.0.5.orign/xapian-config.in xapian-core-1.0.5/xapian-config.in
---- xapian-core-1.0.5.orign/xapian-config.in	2007-12-21 04:01:25.000000000 +0100
-+++ xapian-core-1.0.5/xapian-config.in	2007-12-26 23:58:34.000000000 +0100
-@@ -61,24 +61,6 @@ is_uninstalled()
- 
- need_explicit_dependencies()
- {
--    # For static libraries, we need to explicitly link with dependency_libs
--    # on all platforms.  If we only have static libraries, then "$dlname"
--    # will be empty.
--    extract_dlname "@libdir@/libxapian.la"
--    [ -n "$dlname" ] || return 0 # "true"
--
--    # If libtool has been patched to give link_all_deplibs=no, don't link them.
--    [ no != "@link_all_deplibs_CXX@" ] || return 1 # "false"
--
--    # Handle cases which libtool thinks are "unknown", but we know are "no".
--    if [ yes != "@link_all_deplibs_CXX@" ]; then
--	case "@host_os@" in
--	linux* | k*bsd*-gnu)
--	    # We don't need dependency_libs for shared libraries on these
--	    # platforms, but upstream libtool doesn't know this (yet).
--	    return 1 ;; # "false"
--	esac
--    fi
-     return 0 # "true"
- }
- 
-@@ -91,7 +73,6 @@ set_F_to_extra_ldflags() {
- # -L option required (if any).
- set_L_to_library_path() {
-     L=
--    [ /usr/lib != "@libdir@" ] && L="-L@libdir@ "
- }
- 
- # -I options for compiling against an uninstalled xapian.
-@@ -227,10 +208,6 @@ while [ 0 != "$#" ] ; do
- 	set_F_to_extra_ldflags
- 	set_L_to_library_path
- 	D=
--	if need_explicit_dependencies ; then
--	    extract_dependency_libs "@libdir@/libxapian.la"
--	    [ -n "$dependency_libs" ] && D=" $dependency_libs"
--	fi
- 	echo "$F$L-lxapian$D"
- 	;;
- 
-@@ -245,22 +222,6 @@ while [ 0 != "$#" ] ; do
- 	    continue
- 	fi
- 
--	# If we need to pull in dependency_libs, we need libxapian.la.
--	# Otherwise just use the appropriate -L and -l options.
--	# Upstream libtool currently never sets link_all_deplibs_CXX=no.
--	# Some Linux distros patch libtool to return no, and some have an
--	# unhelpful policy of not packaging .la files in an attempt to work
--	# around this.  So avoiding using libtool here gives more consistent
--	# behaviour.
--	if need_explicit_dependencies ; then
--	    if [ -f "@libdir@/libxapian.la" ]; then
--		echo "${F}@libdir@/libxapian.la"
--		continue
--	    fi
--
--	    echo "$0: Can't find libxapian.la to link against." 1>&2
--	    exit 1
--	fi
- 
- 	set_L_to_library_path
- 	echo "$F$L-lxapian"
diff --git a/sources b/sources
index 1203b68..6922dd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-121b5333d3debcf08ed0be714a641eef  xapian-core-1.2.0.tar.gz
+14f14f7a3e8821fff4bdfa8f475e7328  xapian-core-1.2.2.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index 33a0b60..1b3bd51 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,13 +1,12 @@
 Name:          xapian-core
-Version:       1.2.0
-Release:       4%{?dist}
+Version:       1.2.2
+Release:       1%{?dist}
 Summary:       The Xapian Probabilistic Information Retrieval Library
 
 Group:         Applications/Databases
 License:       GPLv2+
 URL:           http://www.xapian.org/
 Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0:        multilib-devel-conflict-fix.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
@@ -103,6 +102,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Wed Jul 14 2010 Peter Robinson <pbrobinson@gmail.com> - 1.2.2-1
+- Update to 1.2.2
+
 * Fri May  7 2010 Peter Robinson <pbrobinson@gmail.com> - 1.2.0-4
 - Move license to libs package, a few other spc cleanups