--- a/avatar.avv.in	Tue May 03 13:30:19 2011 +0300
+++ b/avatar.avv.in	Sat May 07 14:50:13 2011 +0300
@@ -3,8 +3,12 @@
 Method:      glib
 Version:     ${PROJECT_VERSION}
 Description: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
-Requires:    modules:2 + pep:1 + commands:3 + compl:3 + settings:1 + utils:2 +
-             xmpp:4 + xmpp_helper:2 + screen:3 + hbuf:1 + hooks:4
+# commands depend on building environment - 4, 3, 2+1
+Requires:    utils:2 + ( roster:4 | roster:3 | roster:2 | roster:1 ) + commands:4 +
+             ( hooks:5 | hooks:4 | hooks:3 | hooks:2 ) + ( xmpp:4 | xmpp:3 | xmpp:2 | xmpp:1 ) +
+	     pep:1 + ( screen:10 | screen:9 | screen:8 | screen:7 | screen:6 | screen:5 ) +
+	     logprint:3 + ( hbuf:3 | hbuf:2 | hbuf:1 ) + settings:1 +
+	     ( xmpp:4 | xmpp:3 | xmpp:2 | xmpp:1 ) + ( xmpp_helper:2 | xmpp_helper:1 )
 Init:        avatar_init
 Uninit:      avatar_uninit