# HG changeset patch # User Michael Schloh von Bennewitz # Date 1343862885 -7200 # Node ID 59ebdf31607e8640912dadc8e61cd99a2c9b8149 # Parent 37a0d0619cff9eb495a4fa1f3872b4714cf91a68 Correct typical english grammar mistakes in german linguistics. diff -r 37a0d0619cff -r 59ebdf31607e openpkg/openpkg.spec --- a/openpkg/openpkg.spec Thu Aug 02 01:08:13 2012 +0200 +++ b/openpkg/openpkg.spec Thu Aug 02 01:14:45 2012 +0200 @@ -223,8 +223,8 @@ Provides: openpkg = %{release}-%{release} %description - This is the OpenPKG Framework, the so-called "bootstrap" package - of OpenPKG. OpenPKG is a cross-platform, self-contained, RPM-based + This is the OpenPKG Framework, the so called "bootstrap" package + of OpenPKG. OpenPKG is a cross platform, self contained, RPM based software packaging solution, targeting the flexible building of software stacks on Unix platforms. The RPM Package Manager (RPM) is the underlying, sophisticated and portable package management @@ -239,7 +239,7 @@ rpm5.org POPT %(echo "%{V_popt}" | awk '{ printf("%%-7s", $1); }') [LGPL] BeeCrypt %(echo "%{V_beecrypt}" | awk '{ printf("%%-7s", $1); }') [LGPL] Lua %(echo "%{V_lua}" | awk '{ printf("%%-7s", $1); }') [MIT] - SQLite %(echo "%{V_sqlite}" | awk '{ printf("%%-7s", $1); }') [Public-Domain] + SQLite %(echo "%{V_sqlite}" | awk '{ printf("%%-7s", $1); }') [Public Domain] PCRE %(echo "%{V_pcre}" | awk '{ printf("%%-7s", $1); }') [BSD/MIT] ZLib %(echo "%{V_zlib}" | awk '{ printf("%%-7s", $1); }') [BSD/MIT] XZ %(echo "%{V_xz}" | awk '{ printf("%%-7s", $1); }') [PD/LGPL/GPL] @@ -578,7 +578,7 @@ plid="${s}/${r}" echo "plid=\"$plid\"; export plid" >>.buildenv - # determine platform-specific build environment + # determine platform specific build environment case $plid in FreeBSD/* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;; NetBSD/* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;; @@ -832,14 +832,14 @@ esac # display verbosity header - set +x; VERBOSE "BUILD: Build GNU bash (Bourne-Again Shell)"; set -x + set +x; VERBOSE "BUILD: Build GNU bash (Bourne-again Shell)"; set -x # build GNU bash tool ( cd bash-%{V_bash} sh $shtool subst \ -e 's;@l_openpkg_release@;OpenPKG;' \ version.c - ( # force disabled wide-character support + ( # force disabled wide character support echo "ac_cv_header_wchar_h=no" echo "ac_cv_header_wctype_h=no" echo "ac_cv_func_mbsrtowcs=no" @@ -1325,7 +1325,7 @@ ) || exit $? # display verbosity header - set +x; VERBOSE "BUILD: Build OpenPKG Frontend (Set-UID Wrapper)"; set -x + set +x; VERBOSE "BUILD: Build OpenPKG Frontend (Setuid Wrapper)"; set -x # build "openpkg" executable ${l_make} -f `SOURCE openpkg.mk` \ @@ -1397,7 +1397,7 @@ chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/lua ) || exit $? - # post-adjust RPM installation + # postadjust RPM installation mv $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/macros \ $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmmacros @@ -1419,7 +1419,7 @@ cp sqlite-%{V_sqlite}/.libs/libsqlite3.a $RPM_BUILD_ROOT%{l_prefix}/lib/librpmsqlite3.a # display verbosity header - set +x; VERBOSE "INSTALL: Post-Adjust Installation"; set -x + set +x; VERBOSE "INSTALL: Postadjust Installation"; set -x # move C API into custom locations mv $RPM_BUILD_ROOT%{l_prefix}/lib/librpm* \ @@ -1724,7 +1724,7 @@ <`SOURCE dot.bash_login` \ >$RPM_BUILD_ROOT%{l_prefix}/.bash_login - # install Run-Command files + # install Runcommand files sed -e "s:@l_prefix@:%{l_prefix}:g" \ -e "s:@l_susr@:%{l_susr}:g" \ -e "s:@l_musr@:%{l_musr}:g" \ @@ -2148,7 +2148,7 @@ # [ ".$1" != .1 ] && exit 0 # this procedure is only usable with root privileges - # (for non-root installations it is not required at all) + # (for nonroot installations it is not required at all) cusr=`(id -un) 2>/dev/null ||\ (id | sed -e 's;^[^(]*(\([^)]*\)).*;\1;') 2>/dev/null ||\ (whoami) 2>/dev/null ||\ @@ -2191,7 +2191,7 @@ [ ".$prefix" = . ] && prefix="%{l_prefix}" prefix=`echo "$prefix" | sed -e 's;//*;/;g' -e 's;/$;;'` - # Pre-flight check before update to make sure that the currently + # Preflight check before update to make sure that the currently # activated license is still valid. This is done just be friendly # to people and to not too easily shoot theirself into the foot # by blindly upgrading and then having to recognize that the new @@ -2209,7 +2209,7 @@ [ ".$id" = . ] && id="UNKNOWN" ( echo "Attention, your currently active license \"$id\" does" echo "not allow you to use this newer version of the OpenPKG Framework!" - echo "We cancel this update to prevent you from a run-time failure." + echo "We cancel this update to prevent you from a runtime failure." echo "Please first upgrade to a newer license with the command:" echo " \$ $prefix/bin/openpkg license update $id " ) | $prefix/lib/openpkg/rpmtool msg -b -t error @@ -2313,7 +2313,7 @@ if [ ".$exists" = . ]; then if [ ".$cusr" != ".root" ]; then echo "openpkg:WARNING: skipping addition of $shell to /etc/shells" 1>&2 - echo "openpkg:WARNING: (would require root-privileges)" 1>&2 + echo "openpkg:WARNING: (would require root privileges)" 1>&2 else echo "${shell}" >>/etc/shells fi @@ -2327,7 +2327,7 @@ for req in "superuser:${susr}:${suid}:${sgrp}:${sgid}" \ "management:${musr}:${muid}:${mgrp}:${mgid}" \ "restricted:${rusr}:${ruid}:${rgrp}:${rgid}" \ - "non-privileged:${nusr}:${nuid}:${ngrp}:${ngid}"; do + "nonprivileged:${nusr}:${nuid}:${ngrp}:${ngid}"; do # split request into class/usr/uid/grp/gid OIFS="$IFS"; IFS=":"; set -- $req; IFS="$OIFS" class="$1"; usr="$2"; uid="$3"; grp="$4"; gid="$5" @@ -2343,7 +2343,7 @@ if [ ".$exists" = . ]; then if [ ".$cusr" != ".root" ]; then echo "openpkg:WARNING: skipping creation of OpenPKG $class user $usr" 1>&2 - echo "openpkg:WARNING: (would require root-privileges)" 1>&2 + echo "openpkg:WARNING: (would require root privileges)" 1>&2 else # add entry to passwd database realname="${prefix} OpenPKG ($class)" @@ -2447,7 +2447,7 @@ if [ ".$exists" = . ]; then if [ ".$cusr" != ".root" ]; then echo "openpkg:WARNING: skipping creation of OpenPKG $class group $grp" 1>&2 - echo "openpkg:WARNING: (would require root-privileges)" 1>&2 + echo "openpkg:WARNING: (would require root privileges)" 1>&2 else case "$plid" in Darwin/10.[1-9]* | Darwin/1[1-9].* ) @@ -2494,8 +2494,8 @@ name_old="`echo "$prefix" | sed -e 's;/;;g'`" name="openpkg-`echo "$prefix" | sed -e 's;[^a-zA-Z0-9];;g'`" if [ ".$cusr" != ".root" ]; then - echo "openpkg:WARNING: skipping creation of system run-command hooks" 1>&2 - echo "openpkg:WARNING: (would require root-privileges)" 1>&2 + echo "openpkg:WARNING: skipping creation of system runcommand hooks" 1>&2 + echo "openpkg:WARNING: (would require root privileges)" 1>&2 else case "$plid" in FreeBSD/* ) @@ -3512,8 +3512,8 @@ # remove the startup/shutdown transfer scripts name="openpkg-`echo "$prefix" | sed -e 's;[^a-zA-Z0-9];;g'`" if [ ".$cusr" != ".root" ]; then - echo "openpkg:WARNING: skipping deletion of system run-command hooks" 1>&2 - echo "openpkg:WARNING: (would require root-privileges)" 1>&2 + echo "openpkg:WARNING: skipping deletion of system runcommand hooks" 1>&2 + echo "openpkg:WARNING: (would require root privileges)" 1>&2 else case "$plid" in FreeBSD/* )