Sun, 29 May 2011 17:14:31 +0200
Correct miniperl linkage and improve package class description text and warnings.
openpkg/openpkg.spec | file | annotate | diff | comparison | revisions | |
openpkg/rpmtool | file | annotate | diff | comparison | revisions |
1.1 --- a/openpkg/openpkg.spec Sun May 29 17:12:08 2011 +0200 1.2 +++ b/openpkg/openpkg.spec Sun May 29 17:14:31 2011 +0200 1.3 @@ -776,6 +776,10 @@ 1.4 for dir in %{l_prefix}/lib /lib64 /usr/lib64 /lib /usr/lib /usr/ccs/lib; do 1.5 [ -d $dir ] && libdirs="$libdirs $dir" 1.6 done 1.7 + loclibs="" 1.8 + case `(uname -s) 2>/dev/null` in 1.9 + Linux ) loclibs="-lm -lrt" ;; 1.10 + esac 1.11 PATH=$PATH:`echo "${l_make}" | sed -e 's;\(.*\)/[^/][^/]*$;\1;'` \ 1.12 ./Configure \ 1.13 -d -e -s \ 1.14 @@ -791,7 +795,7 @@ 1.15 -Dldflags="-L""%{l_prefix}/lib" \ 1.16 -Dlibpth="$libdirs" \ 1.17 -Dglibpth="$libdirs" \ 1.18 - -Dlibs="-lm" \ 1.19 + -Dlibs="$loclibs" \ 1.20 -Dscriptdir="%{l_prefix}/bin" \ 1.21 -Uinstallusrbinperl \ 1.22 -Adefine:useshrplib='false' \
2.1 --- a/openpkg/rpmtool Sun May 29 17:12:08 2011 +0200 2.2 +++ b/openpkg/rpmtool Sun May 29 17:14:31 2011 +0200 2.3 @@ -1114,30 +1114,30 @@ 2.4 PLUS ) 2.5 echo "set +x" 2.6 ( echo "This OpenPKG package is of class PLUS." 2.7 - echo "This means it is still in extended QUALITY ASSURANCE state." 2.8 - echo "Hence it is still NOT ready for careless use." 2.9 + echo "It is still in a QUALITY ASSURANCE state," 2.10 + echo "therefore it is NOT ready for careless use." 2.11 echo "Do not use it in critical production environments." 2.12 - echo "It might be still potentially unstable under run-time." 2.13 + echo "This software might still be unstable at runtime." 2.14 ) | sh $prog_path msg -r -t notice | sed -e 's;^;echo ";' -e 's;$;";' 2.15 echo "set -x" 2.16 ;; 2.17 EVAL ) 2.18 echo "set +x" 2.19 ( echo "This OpenPKG package is of class EVAL." 2.20 - echo "This means it is still in EVALUATION and QUALITY ASSURANCE state." 2.21 - echo "Hence it is still NOT ready for general use." 2.22 + echo "It is still in a EVALUATION and QA state," 2.23 + echo "therefore it is NOT ready for general use." 2.24 echo "Do not use it in production environments." 2.25 - echo "It might be unstable under run-time or still incompletely packaged." 2.26 + echo "It might be unstable or incompletely packaged." 2.27 ) | sh $prog_path msg -r -t warn | sed -e 's;^;echo ";' -e 's;$;";' 2.28 echo "set -x" 2.29 ;; 2.30 JUNK ) 2.31 echo "set +x" 2.32 ( echo "This OpenPKG package is of class JUNK." 2.33 - echo "This means it is still in DEVELOPMENT state." 2.34 - echo "Hence it is still NOT ready even for general evaluation." 2.35 + echo "It is still in DEVELOPMENT state," 2.36 + echo "therefore it is NOT ready to be used." 2.37 echo "Do not use it at all, except in development environments!" 2.38 - echo "It is definitely unstable and incompletely packaged." 2.39 + echo "This software is either unstable or incompletely packaged." 2.40 ) | sh $prog_path msg -r -t warn | sed -e 's;^;echo ";' -e 's;$;";' 2.41 echo "set -x" 2.42 ;;