diff --git a/.cvsignore b/.cvsignore
index ed9a7d2..f4336d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-subversion-1.2.0.tar.gz
+subversion-1.2.1.tar.gz
+subversion-1.2.1
diff --git a/sources b/sources
index 17fc062..ddfba60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad2daf6ec0f17b84131828eca9888c98  subversion-1.2.0.tar.gz
+01c3742745d50d4395684a4fb2908c5f  subversion-1.2.1.tar.gz
diff --git a/subversion.spec b/subversion.spec
index abcbc0e..046b81e 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -17,8 +17,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.2.0
-Release: 2
+Version: 1.2.1
+Release: 3
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -31,9 +31,10 @@ Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
 Patch6: subversion-1.0.3-pie.patch
 Patch7: subversion-1.1.3-java.patch
-BuildPreReq: autoconf, libtool, python, python-devel, texinfo
-BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.20-1, docbook-style-xsl
-BuildPreReq: apr-devel >= 0.9.6-1, apr-util-devel, neon-devel >= 0:0.24.7-1
+BuildRequires: autoconf, libtool, python, python-devel, texinfo
+BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.20-1, docbook-style-xsl
+BuildRequires: apr-devel >= 0.9.6-1, apr-util-devel >= 0.9.5-1
+BuildRequires: neon-devel >= 0:0.24.7-1
 BuildRoot: %{_tmppath}/%{name}-root
 
 %define __perl_requires %{SOURCE3}
@@ -86,7 +87,7 @@ This package includes the Perl bindings to the Subversion libraries.
 Group: Development/Libraries
 Summary: JNI bindings to the Subversion libraries
 Requires: subversion = %{version}-%{release}
-BuildPreReq: java-1.4.2-gcj-compat-devel
+BuildRequires: java-1.4.2-gcj-compat-devel
 
 %description javahl
 This package includes the JNI bindings to the Subversion libraries.
@@ -95,7 +96,7 @@ This package includes the JNI bindings to the Subversion libraries.
 %package ruby
 Group: Development/Libraries
 Summary: Ruby bindings to the Subversion libraries
-BuildRequires: ruby-devel >= 1.8.2
+BuildRequires: ruby-devel >= 1.8.2, ruby >= 1.8.2
 Requires: subversion = %{version}-%{release}, ruby-libs >= 1.8.2
 
 %description ruby
@@ -125,7 +126,8 @@ export svn_cv_ruby_link="%{__cc} -shared"
 export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--with-swig --with-neon=%{_prefix} \
-        --with-apxs=%{_sbindir}/apxs --disable-mod-activation
+        --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
+        --disable-static
 make %{?_smp_mflags} all
 make swig-pl swig-py %{swigdirs}
 %if %{with_java}
@@ -217,8 +219,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %files devel
 %defattr(-,root,root)
 %{_includedir}/subversion-1
-%{_libdir}/libsvn*.a
-%{_libdir}/libsvn*.la
+%{_libdir}/libsvn*.*a
 %{_libdir}/libsvn*.so
 %exclude %{_libdir}/libsvn_swig_perl*
 
@@ -249,6 +250,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Jul 22 2005 Joe Orton <jorton@redhat.com> 1.2.0-3
+- update to 1.2.1
+- fix BuildRequires for ruby and apr-util (#163126)
+- drop static library archives
+
 * Wed May 25 2005 Joe Orton <jorton@redhat.com> 1.2.0-2
 - disable java on all but x86, x86_64, ppc (#158719)
 
diff --git a/upstream b/upstream
index ed9a7d2..c87bf57 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-subversion-1.2.0.tar.gz
+subversion-1.2.1.tar.gz