OpenPKG Specs: comparison openpkg/openpkg.spec

-:69c03079fb57
+:ff15e70ab6ef
 Provides:     %{l_prefix}
 Provides:     OpenPKG
 Provides:     openpkg = %{release}-%{release}
 %description
-This is the OpenPKG Framework, the so-called "bootstrap" package
+This is the OpenPKG Framework, the so called "bootstrap" package
-of OpenPKG. OpenPKG is a cross-platform, self-contained, RPM-based
+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
 tool which drives the automated building, installation, management
 and deinstallation of all Unix software components in an OpenPKG
 OpenPKG Framework  %(echo "%{version}"                    | awk '{ printf("%%-7s", $1); }') [Proprietary]
 rpm5.org RPM       %(echo "%{V_rpm_major}.%{V_rpm_minor}" | awk '{ printf("%%-7s", $1); }') [LGPL]
 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]
 GNU Bzip2          %(echo "%{V_bzip2}"                    | awk '{ printf("%%-7s", $1); }') [BSD/MIT]
 GNU Gzip           %(echo "%{V_gzip}"                     | awk '{ printf("%%-7s", $1); }') [GPL]
 s=`(uname -s) 2>/dev/null` || s='Unknown'
 r=`(uname -r) 2>/dev/null` || r='0.0'
 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" ;;
 Linux/*   ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;;
 SunOS/*   ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin:/usr/ccs/bin" ;;
 ia64-*           ) bitopt=-m64 ;;
 sparc64-*        ) bitopt=-m64 ;;
 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"
 #   force disabled internationalization support
 echo "ac_cv_header_libintl_h=no"
 #   build program
 ${l_make}
 ) || 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` \
 CC="${l_cc}" \
 OPENPKG_PREFIX="%{l_prefix}" \
 ${l_make} install DESTDIR="$RPM_BUILD_ROOT"
 cp lua/rpmlua $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/lua
 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
 #   display verbosity header
 set +x; VERBOSE "INSTALL: Install Additional Files"; set -x
 cp popt-%{V_popt}/.libs/libpopt.a $RPM_BUILD_ROOT%{l_prefix}/lib/librpmpopt.a
 cp sqlite-%{V_sqlite}/sqlite3.h $RPM_BUILD_ROOT%{l_prefix}/include/openpkg/rpm/
 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* \
 $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
 mv $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/rpm.pc \
 >$RPM_BUILD_ROOT%{l_prefix}/.bashrc
 sed -e "s:@l_prefix@:%{l_prefix}:g" \
 <`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" \
 <`SOURCE rc` \
 >$RPM_BUILD_ROOT%{l_prefix}/etc/rc
 %pre
 #   always performed for upgrades and because it doesn't harm!
 #   [ ".$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 ||\
 (who am i | cut "-d " -f1) 2>/dev/null ||\
 echo $LOGNAME`
 #   determine prefix
 [ ".$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
 #   OpenPKG Framework is no longer covered by the old license.
 if [ ".$1" = .2 ]; then
 if [ ".$output" != . ]; then
 id="`($prefix/bin/openpkg license active) 2>/dev/null`"
 [ ".$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 <file>"
 ) | $prefix/lib/openpkg/rpmtool msg -b -t error
 exit 42
 fi
 if [ -f /etc/shells ]; then
 exists=`cat /etc/shells 2>/dev/null | grep "^$shell"`
 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
 fi
 fi
 #   create the hierarchy user/group
 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"
 #   check whether user already exists
 dscl . -read "/users/$usr" | grep RecordName) 2>/dev/null | \
 sed -e 'q'`
 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)"
 case "$plid" in
 FreeBSD/* | NetBSD/* )
 dscl . -read "/groups/$grp" | grep RecordName) 2>/dev/null | \
 sed -e 'q'`
 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].* )
 dscl . -create "/groups/${grp}"
 dscl . -create "/groups/${grp}" Password        "*"
 #   create the startup/shutdown transfer script
 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: skipping creation of system runcommand hooks" 1>&2
-echo "openpkg:WARNING: (would require root-privileges)" 1>&2
+echo "openpkg:WARNING: (would require root privileges)" 1>&2
 else
 case "$plid" in
 FreeBSD/* )
 if [ -f /etc/rc.d/${name_old} ]; then
 rm -f /etc/rc.d/${name_old}
 fi
 #   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: skipping deletion of system runcommand hooks" 1>&2
-echo "openpkg:WARNING: (would require root-privileges)" 1>&2
+echo "openpkg:WARNING: (would require root privileges)" 1>&2
 else
 case "$plid" in
 FreeBSD/* )
 rm -f /etc/rc.d/${name} >/dev/null 2>&1
 ;;

OpenPKG Specs / file comparison

comparison: openpkg/openpkg.spec

openpkg/openpkg.spec