# HG changeset patch # User Michael Schloh von Bennewitz # Date 1306682071 -7200 # Node ID c403d9dd5e0ef37705cb10fcc07a3d1e4771ac14 # Parent b7180006bcf1139a245d71eefa3a83a3bedd5f42 Correct miniperl linkage and improve package class description text and warnings. diff -r b7180006bcf1 -r c403d9dd5e0e openpkg/openpkg.spec --- a/openpkg/openpkg.spec Sun May 29 17:12:08 2011 +0200 +++ b/openpkg/openpkg.spec Sun May 29 17:14:31 2011 +0200 @@ -776,6 +776,10 @@ for dir in %{l_prefix}/lib /lib64 /usr/lib64 /lib /usr/lib /usr/ccs/lib; do [ -d $dir ] && libdirs="$libdirs $dir" done + loclibs="" + case `(uname -s) 2>/dev/null` in + Linux ) loclibs="-lm -lrt" ;; + esac PATH=$PATH:`echo "${l_make}" | sed -e 's;\(.*\)/[^/][^/]*$;\1;'` \ ./Configure \ -d -e -s \ @@ -791,7 +795,7 @@ -Dldflags="-L""%{l_prefix}/lib" \ -Dlibpth="$libdirs" \ -Dglibpth="$libdirs" \ - -Dlibs="-lm" \ + -Dlibs="$loclibs" \ -Dscriptdir="%{l_prefix}/bin" \ -Uinstallusrbinperl \ -Adefine:useshrplib='false' \ diff -r b7180006bcf1 -r c403d9dd5e0e openpkg/rpmtool --- a/openpkg/rpmtool Sun May 29 17:12:08 2011 +0200 +++ b/openpkg/rpmtool Sun May 29 17:14:31 2011 +0200 @@ -1114,30 +1114,30 @@ PLUS ) echo "set +x" ( echo "This OpenPKG package is of class PLUS." - echo "This means it is still in extended QUALITY ASSURANCE state." - echo "Hence it is still NOT ready for careless use." + echo "It is still in a QUALITY ASSURANCE state," + echo "therefore it is NOT ready for careless use." echo "Do not use it in critical production environments." - echo "It might be still potentially unstable under run-time." + echo "This software might still be unstable at runtime." ) | sh $prog_path msg -r -t notice | sed -e 's;^;echo ";' -e 's;$;";' echo "set -x" ;; EVAL ) echo "set +x" ( echo "This OpenPKG package is of class EVAL." - echo "This means it is still in EVALUATION and QUALITY ASSURANCE state." - echo "Hence it is still NOT ready for general use." + echo "It is still in a EVALUATION and QA state," + echo "therefore it is NOT ready for general use." echo "Do not use it in production environments." - echo "It might be unstable under run-time or still incompletely packaged." + echo "It might be unstable or incompletely packaged." ) | sh $prog_path msg -r -t warn | sed -e 's;^;echo ";' -e 's;$;";' echo "set -x" ;; JUNK ) echo "set +x" ( echo "This OpenPKG package is of class JUNK." - echo "This means it is still in DEVELOPMENT state." - echo "Hence it is still NOT ready even for general evaluation." + echo "It is still in DEVELOPMENT state," + echo "therefore it is NOT ready to be used." echo "Do not use it at all, except in development environments!" - echo "It is definitely unstable and incompletely packaged." + echo "This software is either unstable or incompletely packaged." ) | sh $prog_path msg -r -t warn | sed -e 's;^;echo ";' -e 's;$;";' echo "set -x" ;;