Author: mvidner Date: Wed Mar 12 14:48:07 2008 New Revision: 45375 URL: http://svn.opensuse.org/viewcvs/yast?rev=45375&view=rev Log: prefixbuild updates Modified: trunk/devtools/prefixbuild/recreate trunk/devtools/prefixbuild/yast2-deps Modified: trunk/devtools/prefixbuild/recreate URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/prefixbuild/recreate?rev=45375&r1=45374&r2=45375&view=diff ============================================================================== --- trunk/devtools/prefixbuild/recreate (original) +++ trunk/devtools/prefixbuild/recreate Wed Mar 12 14:48:07 2008 @@ -52,8 +52,8 @@ #check that we are in the right directory: .../trunk or .../branches/$B if $DIRECTORY_CHECK; then - if ! test -f extra-packages; then - echo "Not in the right directory. extra-packages not seen." + if ! test -f extra-packages -o -d libzypp; then + echo "Not in the right directory. extra-packages or libzypp not seen." exit 1 fi fi @@ -127,7 +127,7 @@ pushd "$MODULE" case "$MODULE" in - zypper|libzypp|qt) init_cmake "$MODULE";; + zypper|libzypp|qt*) init_cmake "$MODULE";; *) init_autotools "$MODULE";; esac @@ -141,7 +141,7 @@ pfx make install case "$MODULE" in - zypper|libzypp|qt) cd ..;; + zypper|libzypp|qt*) cd ..;; esac touch .recreated popd Modified: trunk/devtools/prefixbuild/yast2-deps URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/prefixbuild/yast2-deps?rev=45375&r1=45374&r2=45375&view=diff ============================================================================== --- trunk/devtools/prefixbuild/yast2-deps (original) +++ trunk/devtools/prefixbuild/yast2-deps Wed Mar 12 14:48:07 2008 @@ -65,7 +65,7 @@ NFB=$(sed -n -e '/^BuildRequires:[[:space:]]*\(.*\)/{;s//\1/;p;}' "$1"/*.spec.in) fi # these are not in NFB but are needed at runtime, so let's sneak them in - REQ="yast2-hardware-detection yast2-ncurses yast2-qt yast2-perl-bindings" + REQ="yast2-hardware-detection yast2-ncurses yast2-ncurses-pkg yast2-qt yast2-qt-pkg yast2-perl-bindings yast2-python-bindings" # expand macros (/work/abuild/lib/abuild/etc/needed_packages.fixes) NFB=${NFB/yast2-devel-packages/yast2-core-devel-packages yast2-pkg-bindings} NFB=${NFB/yast2-core-devel-packages/yast2-devtools liby2util yast2-core yast2-packagemanager yast2-testsuite yast2-perl-bindings yast2} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org