Index: SPECS/rpm.spec
===================================================================
--- SPECS.orig/rpm.spec
+++ SPECS/rpm.spec
@@ -14,7 +14,7 @@ Summary: The RPM package management syst
 Name: rpm
 Version: 4.4.2.1
 %{expand: %%define rpm_version %{version}-rc3}
-Release: 0.4.rc3
+Release: 0.4.rc3.fa1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: rpm-%{rpm_version}.tar.gz
@@ -24,6 +24,8 @@ Patch3: rpm-4.4.2-trust.patch
 Patch4: rpm-4.4.2-devel-autodep.patch
 Patch5: rpm-4.4.2-rpmfc-skip.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
+Patch7: rpm-4.4.2.1-rc1-arm-config-guess.patch
+Patch8: rpm-4.4.2.1-rc3-rpmcanongnu.patch
 License: GPL
 Requires(pre): shadow-utils
 Requires(postun): shadow-utils
@@ -133,6 +135,8 @@ shell-like rules.
 %patch4 -p1 -b .develdeps
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
+%patch7 -p1 -b .arm
+%patch8 -p1 -b .rpmcanongnu
 
 %build
 
@@ -142,6 +146,7 @@ unset LD_ASSUME_KERNEL || :
 WITH_PYTHON="--with-python=%{with_python_version}"
 
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
+autoconf
 ./configure --prefix=%{__prefix} --sysconfdir=/etc \
         --localstatedir=/var --infodir='${prefix}%{__share}/info' \
         --mandir='${prefix}%{__share}/man' \
@@ -313,8 +318,8 @@ exit 0
 %ifarch s390 s390x
 %attr(-, rpm, rpm)              %{__prefix}/lib/rpm/s390*
 %endif
-%ifarch armv3l armv4l
-%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/armv[34][lb]*
+%ifarch %{arm}
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/arm*
 %endif
 %ifarch mips mipsel
 %attr(-, rpm, rpm)              %{__prefix}/lib/rpm/mips*