Index: rpm-4.9.1.3/Makefile.in
===================================================================
--- rpm-4.9.1.3.orig/Makefile.in	2012-09-25 10:52:50.000000000 +0200
+++ rpm-4.9.1.3/Makefile.in	2012-09-25 10:56:42.000000000 +0200
@@ -1650,9 +1650,9 @@
 
 install-exec-hook:
 	@rm -f $(DESTDIR)$(bindir)/rpmquery
-	@LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmquery
+	@LN_S@ ../bin/rpm $(DESTDIR)$(bindir)/rpmquery
 	@rm -f $(DESTDIR)$(bindir)/rpmverify
-	@LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmverify
+	@LN_S@ ../bin/rpm $(DESTDIR)$(bindir)/rpmverify
 
 install-data-local:
 	@case "@host_os@" in \
Index: rpm-4.9.1.3/tests/atlocal.in
===================================================================
--- rpm-4.9.1.3.orig/tests/atlocal.in	2012-04-03 15:54:11.000000000 +0200
+++ rpm-4.9.1.3/tests/atlocal.in	2012-09-25 10:57:09.000000000 +0200
@@ -22,12 +22,12 @@
 
 RPM_XFAIL=${RPM_XFAIL-1}
 
-function run()
+function run
 {
     "$@" --define "_topdir ${TOPDIR}"
 }
 
-function runroot()
+function runroot
 {
     (cd ${RPMTEST} && \
      mkdir -p etc && touch etc/mtab &&