Index: ext/rpm/rpm.c
===================================================================
--- ext/rpm/rpm.c
+++ ext/rpm/rpm.c	2007-06-10 23:28:57.000000000 +0200
@@ -500,7 +500,9 @@
 	DEF_TRANS_FLAG(PKGUNDO);
 	DEF_TRANS_FLAG(COMMIT);
 	DEF_TRANS_FLAG(UNDO);
+#if RPM_VERSION_CODE < RPM_VERSION(4,4,8)
 	DEF_TRANS_FLAG(REVERSE);
+#endif
 	DEF_TRANS_FLAG(NOTRIGGERPREIN);
 	DEF_TRANS_FLAG(NOPRE);
 	DEF_TRANS_FLAG(NOPOST);
@@ -514,17 +516,21 @@
 #if RPM_VERSION_CODE < RPM_VERSION(4,1,0)
 	DEF_TRANS_FLAG(CHAINSAW);
 #else
+#if RPM_VERSION_CODE < RPM_VERSION(4,4,8)
 	DEF_TRANS_FLAG(ANACONDA);
 #endif
+#endif
 /* NOMD5 is not in jbj's 4.4.6 any more - Mandriva uses that */
 #ifdef RPMTRANS_FLAG_NOMD5
 	DEF_TRANS_FLAG(NOMD5);
 #endif
 #if RPM_VERSION(4,1,0) <= RPM_VERSION_CODE
+#if RPM_VERSION(4,4,8) < RPM_VERSION_CODE
 	DEF_TRANS_FLAG(NOSUGGEST);
 	DEF_TRANS_FLAG(ADDINDEPS);
 	DEF_TRANS_FLAG(NOCONFIGS);
 #endif
+#endif
 #undef DEF_TRANS_FLAG
 
 #define DEF_PROB_FILTER(name) \
@@ -655,6 +661,6 @@
 	rb_gc_register_address(&ruby_rpm_temp_format);
 
 	rpmReadConfigFiles(NULL, NULL);
-	rpmInitMacros(NULL, macrofiles);
+	rpmInitMacros(NULL, NULL);
 	rpmSetVerbosity(RPMLOG_EMERG);
 }
Index: ext/rpm/spec.c
===================================================================
--- ext/rpm/spec.c
+++ ext/rpm/spec.c	2007-06-10 23:31:12.000000000 +0200
@@ -83,8 +83,8 @@
 VALUE
 rpm_spec_get_buildroot(VALUE spec)
 {
-	if (RPM_SPEC(spec)->buildRootURL) {
-		return rb_str_new2(RPM_SPEC(spec)->buildRootURL);
+	if (RPM_SPEC(spec)->rootURL) {
+		return rb_str_new2(RPM_SPEC(spec)->rootURL);
 	}
 	return Qnil;
 }