diff -r 4722cd3437cb -r 4819c228434c razor.h
--- a/razor.h	Fri Feb 29 11:53:15 2008 -0500
+++ b/razor.h	Mon Mar 03 16:19:56 2008 -0500
@@ -83,13 +83,15 @@
 	RAZOR_PACKAGE_UNAVAILABLE   = 0x04,
 	RAZOR_PACKAGE_UNSATISFIABLE = 0x08,
 	RAZOR_PACKAGE_BLOCKED       = 0x10,
+	RAZOR_PACKAGE_CONFLICT      = 0x20,
 
 	/* Error states */
 	RAZOR_PACKAGE_INSTALL_UNAVAILABLE   = RAZOR_PACKAGE_INSTALL | RAZOR_PACKAGE_UNAVAILABLE,
 	RAZOR_PACKAGE_INSTALL_UNSATISFIABLE = RAZOR_PACKAGE_INSTALL | RAZOR_PACKAGE_UNSATISFIABLE,
-	RAZOR_PACKAGE_INSTALL_BLOCKED = RAZOR_PACKAGE_INSTALL | RAZOR_PACKAGE_BLOCKED,
+	RAZOR_PACKAGE_INSTALL_CONFLICT = RAZOR_PACKAGE_INSTALL | RAZOR_PACKAGE_CONFLICT,
 	RAZOR_PACKAGE_REMOVE_NOT_INSTALLED  = RAZOR_PACKAGE_REMOVE | RAZOR_PACKAGE_UNAVAILABLE,
-	RAZOR_PACKAGE_REMOVE_BLOCKED  = RAZOR_PACKAGE_REMOVE | RAZOR_PACKAGE_BLOCKED
+	RAZOR_PACKAGE_REMOVE_BLOCKED  = RAZOR_PACKAGE_REMOVE | RAZOR_PACKAGE_BLOCKED,
+	RAZOR_PACKAGE_REMOVE_CONFLICT  = RAZOR_PACKAGE_REMOVE | RAZOR_PACKAGE_CONFLICT
 };
 
 struct razor_transaction_package {
@@ -98,6 +100,7 @@
 	enum razor_transaction_package_state state;
 
 	const char *req_package;
+	enum razor_property_type req_type;
 	const char *req_property;
 	enum razor_version_relation req_relation;
 	const char *req_version;