[Rpm-maint] [PATCH] Spelling fixes.

Ville Skyttä ville.skytta at iki.fi
Sat Feb 16 18:29:33 UTC 2013 

---
 CHANGES                        | 20 ++++++++--------
 INSTALL                        | 12 +++++-----
 autodeps/freebsdelf.req        |  2 +-
 autodeps/hpux.prov             |  2 +-
 autodeps/osf.req               |  2 +-
 lib/fsm.c                      |  4 ++--
 lib/header.c                   |  4 ++--
 lib/rpmdb.c                    |  4 ++--
 lib/rpmdb.h                    |  4 ++--
 lib/rpmfi.c                    |  2 +-
 lib/rpmfi.h                    |  6 ++---
 lib/rpmprob.h                  |  2 +-
 lib/rpmts.h                    |  4 ++--
 lib/rpmvercmp.c                |  2 +-
 lib/transaction.c              |  4 ++--
 macros.in                      |  2 +-
 misc/fts.h                     |  4 ++--
 python/header-py.c             |  2 +-
 python/rpm/transaction.py      |  2 +-
 python/rpmts-py.c              |  2 +-
 rpmio/argv.h                   |  6 ++---
 rpmio/rpmpgp.h                 |  2 +-
 rpmio/rpmstrpool.c             |  2 +-
 rpmio/rpmutil.h                |  2 +-
 scripts/brp-python-bytecompile |  6 ++---
 scripts/perl.prov              |  4 ++--
 scripts/rpm_fulldb_update      | 14 ++++++------
 scripts/rpmsync                | 52 +++++++++++++++++++++---------------------
 scripts/vpkg-provides.sh       | 10 ++++----
 tests/rpmpython.at             |  2 +-
 30 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/CHANGES b/CHANGES
index d6365c1..dc07f51 100644
--- a/CHANGES
+++ b/CHANGES
@@ -508,7 +508,7 @@
 	- use rpmfiFClass() underneath --fileclass.
 	- use rpmfiFDepends() underneath --fileprovide and --filerequire.
 	- python: add fi.FColor() and fi.FClass() methods.
-	- calculate dependency color and refernces.
+	- calculate dependency color and references.
 	- python: add ds.Color() and ds.Refs() methods.
 	- fix: typo in assertion.
 	- add rpmts/rpmte/rpmfi/rpmds element colors.
@@ -656,7 +656,7 @@
 	- eliminate db1 support.
 	- enable CDB by default.
 	- use DBT_DB_MALLOC to eliminate re-malloc'ing header blobs.
-	- rework most of rpmdb.c prepatory to implementing duplicates.
+	- rework most of rpmdb.c preparatory to implementing duplicates.
 	- fix: 2 memory leaks in headerSprintf.
 	- fix: db mire's access out-of-bounds memory.
 	- plug install mode leaks.
@@ -958,7 +958,7 @@
 	- upgrade to db-3.3.4.
 	- fix: filter duplicate package removals (#35828).
 	- add armv3l arch.
-	- fix: i18n strings need 1 on sucess return code (#41313).
+	- fix: i18n strings need 1 on success return code (#41313).
 	- fix: skip %ghost files when building packages (#38218).
 	- headerFree() returns NULL, _free is C++ safe.
 	- remove all header region assertion failures, return NULL instead.
@@ -1054,7 +1054,7 @@
 	- popthelp.c: don't use stpcpy to avoid portability grief (#47500).
 	- permit alias/exec description/arg text to be set from popt config.
 	- python: rhnLoad/rhnUnload to check header digest.
-	- package version now configureable, default v3.
+	- package version now configurable, default v3.
 	- rename rpm libraries to have version with libtool -release.
 	- fix: -i CLI context broken Yet Again.
 	- unlink all __db.nnn files before 1st db open.
@@ -1095,7 +1095,7 @@
 	- fix: --noscripts is another multimode option.
 	- add tmpdir to configure db3 tmpdir into chroot tree.
 	- permit lazy db opens within chroot.
-	- fix: diddle dbenv path to accomodate backing store reopen in chroot.
+	- fix: diddle dbenv path to accommodate backing store reopen in chroot.
 	- add support for mips (#49283).
 	- add __as, _build_arch, and __cxx macros (#36662, #36663, #49280).
 	- detailed build package error messages.
@@ -1521,7 +1521,7 @@
 	   expand %# just like %{#} (and with same value as shell analogues).
 	   macro defaults for *, 0, and # if no args specified.
 	   getopt on non-linux requires optind to be saved/restored.
-	- fix: don't remove file until last occurence in transaction (#4291).
+	- fix: don't remove file until last occurrence in transaction (#4291).
 	- resuscitate net shared paths (#4330).
 	- fix: macro table cannot contain NULL pointers (#4263).
 	- fix: last char in rpmrc w/o terminating newline lost (#4361).
@@ -1987,7 +1987,7 @@
 	- cpio error codes were poorly defined, causing bad error messages
 	- generates INSTPREFIXES tag properly, and sets RPM_INSTALL_PREFIX
 	  and RPM_INSTALL_PREFIXn environment variables
-	- fixed memory leak in install code which occured when net shared paths
+	- fixed memory leak in install code which occurred when net shared paths
 	  were used
 	- don't pass net shared path to rpmInstallPackage() -- it looks 
 	  directly in the rpmrc entries
@@ -2314,7 +2314,7 @@
 2.3.9 -> 2.3.10:
 	- --allmatches handling in -e broke some cases
 	- new predefined macros: %SOURCEn %PATCHn %SOURCEURLn %PATCHURLn
-	- fix anomoly with %files -f <file> and %doc
+	- fix anomaly with %files -f <file> and %doc
 	- ignore config bit when it's set on directories (which allows
 	  users to replace directories with symlinks)
 	- don't set config bit on directories
@@ -2392,7 +2392,7 @@
 	- array size mismatches in --qf should send error to stderr
 	- tried to make the locale stuff a bit more portable (again)
 	- reworked the owner/group setting on installs to be more generic
-	  (in preperation for getting rid of cpio)
+	  (in preparation for getting rid of cpio)
 	- made verify verify owner and groups by name rather then by id -- if
 	  the symbolic names aren't available use the uids
 	- cleaned up relocateFilelist() and related code thanks to
@@ -2403,7 +2403,7 @@
 	  installs of all things (Jason Salopek pestered me consistently
 	  enough to keep this on the front burner for me)
 	- removed FILEUIDS and FILEGIDS from the header in the database --
-	  we never used it and it jsut wasted room
+	  we never used it and it just wasted room
 	- convert uid/gid lists in v1 headers to symbolic names 
 
 2.3.3 -> 2.3.4:
diff --git a/INSTALL b/INSTALL
index 85cc8d6..60536e3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -77,7 +77,7 @@ is available from
 It may be desired to install bzip2, gzip, and xz/lzma so that RPM can use these
 formats.  Gzip is necessary to build packages that contain compressed
 tar balls, these are quite common on the Internet.
-These are availible from
+These are available from
     http://www.gzip.org
     http://www.bzip.org
     http://tukaani.org/xz/
@@ -164,7 +164,7 @@ and then install with:
 Rpm comes with an automated self-test suite. The test-suite relies heavily
 on fakechroot (https://github.com/fakechroot/) and cannot be executed
 without it. Provided that fakechroot was found during configure,
-it can be executed after a succesful build with:
+it can be executed after a successful build with:
 
     make check
 
@@ -186,7 +186,7 @@ with two rpms which can be found in RPMS and SRPMS.
 If you are going to install rpm on machines with OS package managers
 other then rpm, you may choose to install the base rpm package via a
 cpio instead of a tar file.  Instead of running "make tar" during the
-build process, as discribed above, use the base rpm packages to create
+build process, as described above, use the base rpm packages to create
 a cpio.  After the rpms have been created run rpm2cpio on the base rpm
 package, this will give you a cpio package which can then use to
 install rpm on a new system.
@@ -208,13 +208,13 @@ an issue.
 RPM will need to be informed of all the dependencies which were
 satisfied before RPM was installed.  Typically this only refers to
 libraries that are installed by the OS, but may include other
-libraries and packages which are availible at the time RPM is
+libraries and packages which are available at the time RPM is
 installed and will not under RPM control.  Another common example of
 libraries which may need dependency provisions are precompiled
 libraries which are installed by the OS package manager during system
 build time.  The list of dependencies you will wish to load into RPM
 will depend on exactly how you bootstrap RPM onto your system and what
-parts of the sytem you put into packages as well as on the specific OS
+parts of the system you put into packages as well as on the specific OS
 you are using.
 
 The script vpkg-provides.sh can be used to generate a package which
@@ -231,7 +231,7 @@ can use the option:
 
 By default the generated rpm will include a %verifyscript to verify
 checksum of all files traversed has not changed.  This additional
-check can be surpressed with:
+check can be suppressed with:
 
     --no_verify
 
diff --git a/autodeps/freebsdelf.req b/autodeps/freebsdelf.req
index dde04c5..9659172 100644
--- a/autodeps/freebsdelf.req
+++ b/autodeps/freebsdelf.req
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # note this works for both a.out and ELF executables
-# it also auto-generates requirment lines for shell scripts
+# it also auto-generates requirement lines for shell scripts
 
 ulimit -c 0
 
diff --git a/autodeps/hpux.prov b/autodeps/hpux.prov
index 9fd4ce6..b1852b3 100644
--- a/autodeps/hpux.prov
+++ b/autodeps/hpux.prov
@@ -70,7 +70,7 @@ do
 			FS = " ";
 			RS = "\n";
 
-			# This flag signfies that we have seen the internal name:
+			# This flag signifies that we have seen the internal name:
 			# marker.  Once we see that, we set the flag to 1.  The next
 			# line we read should contain the library internal name, the
 			# SOM equivalent of an soname.  At that point we set the flag
diff --git a/autodeps/osf.req b/autodeps/osf.req
index 39d00c3..5317815 100644
--- a/autodeps/osf.req
+++ b/autodeps/osf.req
@@ -55,7 +55,7 @@ while read f
 do
 
 	#
-	# Uncomment the next line for addtional debugging:
+	# Uncomment the next line for additional debugging:
 	# echo "read ->$f<-"
 
 	#
diff --git a/lib/fsm.c b/lib/fsm.c
index 5ebf28d..9e6b98d 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -1582,7 +1582,7 @@ static int fsmCommit(FSM_t fsm, int ix)
 
 /**
  * Return formatted string representation of file disposition.
- * @param a		file dispostion
+ * @param a		file disposition
  * @return		formatted string
  */
 static const char * fileActionString(rpmFileAction a)
@@ -1719,7 +1719,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfi fi, FD_t cfd,
                     }
                 }
             } else if (S_ISFIFO(st->st_mode)) {
-                /* This mimics cpio S_ISSOCK() behavior but probably isnt' right */
+                /* This mimics cpio S_ISSOCK() behavior but probably isn't right */
                 rc = fsmVerify(fsm);
                 if (rc == CPIOERR_ENOENT) {
                     rc = fsmMkfifo(fsm->path, 0000);
diff --git a/lib/header.c b/lib/header.c
index 0f00dff..b24d16e 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -749,7 +749,7 @@ int headerDel(Header h, rpmTagVal tag)
     entry = findEntry(h, tag, RPM_NULL_TYPE);
     if (!entry) return 1;
 
-    /* Make sure entry points to the first occurence of this tag. */
+    /* Make sure entry points to the first occurrence of this tag. */
     while (entry > h->index && (entry - 1)->info.tag == tag)  
 	entry--;
 
@@ -1649,7 +1649,7 @@ int headerMod(Header h, rpmtd td)
     if (data == NULL)
 	return 0;
 
-    /* make sure entry points to the first occurence of this tag */
+    /* make sure entry points to the first occurrence of this tag */
     while (entry > h->index && (entry - 1)->info.tag == td->tag)  
 	entry--;
 
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index a83b902..efaa395 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -827,7 +827,7 @@ static int openDatabase(const char * prefix,
     if (db == NULL)
 	return 1;
 
-    /* Try to ensure db home exists, error out if we cant even create */
+    /* Try to ensure db home exists, error out if we can't even create */
     rc = rpmioMkpath(rpmdbHome(db), 0755, getuid(), getgid());
     if (rc == 0) {
 	if (rpmdbRock == NULL) {
@@ -2720,7 +2720,7 @@ int rpmdbAdd(rpmdb db, Header h)
 	}
     }
 
-    /* If everthing ok, mark header as installed now */
+    /* If everything ok, mark header as installed now */
     if (ret == 0) {
 	headerSetInstance(h, hdrNum);
 	/* Purge our verification cache on added public keys */
diff --git a/lib/rpmdb.h b/lib/rpmdb.h
index 3c7aac2..829f19c 100644
--- a/lib/rpmdb.h
+++ b/lib/rpmdb.h
@@ -171,8 +171,8 @@ rpmdbIndexIterator rpmdbIndexIteratorInit(rpmdb db, rpmDbiTag rpmtag);
  * Get the next key - Warning! Keys are not zero terminated!
  * Binary tags may even contain zero bytes
  * @param ii		index iterator
- * @param key		adress to save the pointer to the key
- * @param keylen	adress to save the length of the key to
+ * @param key		address to save the pointer to the key
+ * @param keylen	address to save the length of the key to
  * @return 		0 on success; != 0 on error or end of index
  */
 int rpmdbIndexIteratorNext(rpmdbIndexIterator ii, const void ** key, size_t * keylen);
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 7f7ef2a..ae5ed07 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -1017,7 +1017,7 @@ assert(fn != NULL);		/* XXX can't happen */
 	    if (relocations[j].newPath) { /* Relocate the path */
 		char *t = NULL;
 		rstrscat(&t, relocations[j].newPath, (dirNames[i] + len), NULL);
-		/* Unfortunatly rpmCleanPath strips the trailing slash.. */
+		/* Unfortunately rpmCleanPath strips the trailing slash.. */
 		(void) rpmCleanPath(t);
 		rstrcat(&t, "/");
 
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index c526c90..4333bf4 100644
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -206,7 +206,7 @@ int rpmfiDigestAlgo(rpmfi fi);
 /** \ingroup rpmfi
  * Return current file (binary) digest of file info set.
  * @param fi		file info set
- * @retval algo		digest hash algoritm used (pass NULL to ignore)
+ * @retval algo		digest hash algorithm used (pass NULL to ignore)
  * @retval diglen	digest hash length (pass NULL to ignore)
  * @return		current file digest, NULL on invalid
  */
@@ -218,7 +218,7 @@ const unsigned char * rpmfiFDigest(rpmfi fi, int *algo, size_t *diglen);
  * memory, this converts the binary data back to hex presentation used in
  * headers. 
  * @param fi		file info set
- * @retval algo		digest hash algoritm used (pass NULL to ignore)
+ * @retval algo		digest hash algorithm used (pass NULL to ignore)
  * @return		current file digest (malloc'ed), NULL on invalid
  */
 char * rpmfiFDigestHex(rpmfi fi, int *algo);
@@ -440,7 +440,7 @@ int rpmfiCompare(const rpmfi afi, const rpmfi bfi);
  * @param ofi		old file info
  * @param nfi		new file info
  * @param skipMissing	OK to skip missing files?
- * @return		file dispostion
+ * @return		file disposition
  */
 rpmFileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing);
 
diff --git a/lib/rpmprob.h b/lib/rpmprob.h
index 2b89f15..ac57885 100644
--- a/lib/rpmprob.h
+++ b/lib/rpmprob.h
@@ -43,7 +43,7 @@ typedef enum rpmProblemType_e {
     RPMPROB_BADRELOCATE,/*!< path ... is not relocatable for package ... */
     RPMPROB_REQUIRES,	/*!< package ... has unsatisfied Requires: ... */
     RPMPROB_CONFLICT,	/*!< package ... has unsatisfied Conflicts: ... */
-    RPMPROB_NEW_FILE_CONFLICT, /*!< file ... conflicts between attemped installs of ... */
+    RPMPROB_NEW_FILE_CONFLICT, /*!< file ... conflicts between attempted installs of ... */
     RPMPROB_FILE_CONFLICT,/*!< file ... from install of ... conflicts with file from package ... */
     RPMPROB_OLDPACKAGE,	/*!< package ... (which is newer than ...) is already installed */
     RPMPROB_DISKSPACE,	/*!< installing package ... needs ... on the ... filesystem */
diff --git a/lib/rpmts.h b/lib/rpmts.h
index 0b8d970..c2e5681 100644
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -468,7 +468,7 @@ rpmtransFlags rpmtsSetFlags(rpmts ts, rpmtransFlags transFlags);
 rpm_color_t rpmtsColor(rpmts ts);
 
 /** \ingroup rpmts
- * Retrieve prefered file color
+ * Retrieve preferred file color
  * @param ts		transaction set
  * @return		color bits
  */
@@ -483,7 +483,7 @@ rpm_color_t rpmtsPrefColor(rpmts ts);
 rpm_color_t rpmtsSetColor(rpmts ts, rpm_color_t color);
 
 /** \ingroup rpmts
- * Set prefered file color
+ * Set preferred file color
  * @param ts		transaction set
  * @param color		new color bits
  * @return		previous color bits
diff --git a/lib/rpmvercmp.c b/lib/rpmvercmp.c
index de3beea..b3d08fa 100644
--- a/lib/rpmvercmp.c
+++ b/lib/rpmvercmp.c
@@ -36,7 +36,7 @@ int rpmvercmp(const char * a, const char * b)
 	while (*one && !risalnum(*one) && *one != '~') one++;
 	while (*two && !risalnum(*two) && *two != '~') two++;
 
-	/* handle the tilde separator, it sorts before everthing else */
+	/* handle the tilde separator, it sorts before everything else */
 	if (*one == '~' || *two == '~') {
 	    if (*one != '~') return 1;
 	    if (*two != '~') return -1;
diff --git a/lib/transaction.c b/lib/transaction.c
index a154f6a..1409cd9 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -438,7 +438,7 @@ static void handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi, int fx,
 	}
     }
 
-    /* Determine config file dispostion, skipping missing files (if any). */
+    /* Determine config file disposition, skipping missing files (if any). */
     if (isCfgFile) {
 	int skipMissing = ((rpmtsFlags(ts) & RPMTRANS_FLAG_ALLFILES) ? 0 : 1);
 	rpmFileAction action;
@@ -502,7 +502,7 @@ static void handleOverlappedFiles(rpmts ts, fingerPrintCache fpc, rpmte p, rpmfi
 	 * that were just installed.
 	 * If both this and the other package are being removed, then each
 	 * file removal from preceding packages needs to be skipped so that
-	 * the file removal occurs only on the last occurence of an overlapped
+	 * the file removal occurs only on the last occurrence of an overlapped
 	 * file in the transaction set.
 	 *
 	 */
diff --git a/macros.in b/macros.in
index 1d0eb6d..582b996 100644
--- a/macros.in
+++ b/macros.in
@@ -891,7 +891,7 @@ package or when debugging this package.\
 #       run configure with correct prefix, platform, and CFLAGS.
 #       optionally restore current directory.
 #
-# Based on autogen.sh from GNOME and orginal GNUconfigure
+# Based on autogen.sh from GNOME and original GNUconfigure
 #
 %GNUconfigure(MCs:)      \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS; \
diff --git a/misc/fts.h b/misc/fts.h
index 47c650e..a01cfa0 100644
--- a/misc/fts.h
+++ b/misc/fts.h
@@ -166,7 +166,7 @@ FTSENT	*Fts_children (FTS * sp, int instr) __THROW
 /**
  * Destroy a file hierarchy traversal handle.
  * @param sp		file hierarchy state
- * @return		0 on sucess, -1 on error
+ * @return		0 on success, -1 on error
  */
 RPM_GNUC_INTERNAL
 int	 Fts_close (FTS * sp) __THROW
@@ -198,7 +198,7 @@ FTSENT	*Fts_read (FTS * sp) __THROW
  * @param sp		file hierarchy state
  * @param p		file set member
  * @param instr		new disposition for file set member
- * @return		0 on sucess, -1 on error
+ * @return		0 on success, -1 on error
  */
 RPM_GNUC_INTERNAL
 int	 Fts_set (FTS * sp, FTSENT * p, int instr) __THROW
diff --git a/python/header-py.c b/python/header-py.c
index d194fdc..a8470ee 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -606,7 +606,7 @@ static int hdrPutTag(Header h, rpmTagVal tag, PyObject *value)
 	    rc = hdrAppendItem(h, tag, type, item);
 	}
     } else {
-	PyErr_SetString(PyExc_RuntimeError, "cant happen, right?");
+	PyErr_SetString(PyExc_RuntimeError, "can't happen, right?");
     }
 
     return rc;
diff --git a/python/rpm/transaction.py b/python/rpm/transaction.py
index 73e4b3c..756e893 100644
--- a/python/rpm/transaction.py
+++ b/python/rpm/transaction.py
@@ -86,7 +86,7 @@ class TransactionSet(TransactionSetCore):
         rc = TransactionSetCore.run(self, callback, data, self._probFilter)
 
         # crazy backwards compatibility goo: None for ok, list of problems
-        # if transaction didnt complete and empty list if it completed
+        # if transaction didn't complete and empty list if it completed
         # with errors
         if rc == 0:
             return None
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 5c6e9ba..12f7498 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -96,7 +96,7 @@
  * @return	None
  *
  * - ts.setFlags(transFlags) Set transaction set flags.
- * @param transFlags - bit(s) to controll transaction operations. The
+ * @param transFlags - bit(s) to control transaction operations. The
  *		following values can be logically OR'ed together:
  *	- rpm.RPMTRANS_FLAG_TEST - test mode, do not modify the RPM
  *		database, change any files, or run any package scripts
diff --git a/rpmio/argv.h b/rpmio/argv.h
index d73a3c3..7b59d34 100644
--- a/rpmio/argv.h
+++ b/rpmio/argv.h
@@ -149,7 +149,7 @@ typedef rpmFlags argvFlags;
 /** \ingroup rpmargv
  * Split a string into an argv array.
  * @param str		string arg to split
- * @param seps		seperator characters
+ * @param seps		separator characters
  * @param flags		flags to control behavior
  * @return		argv array
  */
@@ -159,7 +159,7 @@ ARGV_t argvSplitString(const char * str, const char * seps, argvFlags flags);
  * Split a string into an argv array.
  * @retval *argvp	argv array
  * @param str		string arg to split
- * @param seps		seperator characters
+ * @param seps		separator characters
  * @return		0 always
  */
 int argvSplit(ARGV_t * argvp, const char * str, const char * seps);
@@ -167,7 +167,7 @@ int argvSplit(ARGV_t * argvp, const char * str, const char * seps);
 /** \ingroup rpmargv
  * Join an argv array into a string.
  * @param *argv		argv array to join
- * @param sep		seperator string to use
+ * @param sep		separator string to use
  * @return		malloc'ed string
  */
 char *argvJoin(ARGV_const_t argv, const char *sep);
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index d454656..4264434 100644
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -974,7 +974,7 @@ char * pgpHexStr(const uint8_t *p, size_t plen);
  * @param pkt		OpenPGP packet (i.e. PGPTAG_PUBLIC_KEY)
  * @param pktlen	OpenPGP packet length (no. of bytes)
  * @retval keyid	public key fingerprint
- * @return		0 on sucess, else -1
+ * @return		0 on success, else -1
  */
 int pgpPubkeyFingerprint(const uint8_t * pkt, size_t pktlen,
 		pgpKeyID_t keyid);
diff --git a/rpmio/rpmstrpool.c b/rpmio/rpmstrpool.c
index 742afaa..ac58a9d 100644
--- a/rpmio/rpmstrpool.c
+++ b/rpmio/rpmstrpool.c
@@ -137,7 +137,7 @@ static void poolHashAddHEntry(rpmstrPool pool, const char * key, unsigned int ke
 {
     poolHash ht = pool->hash;
 
-    /* keep load factor inbetween 0.25 and 0.5 */
+    /* keep load factor between 0.25 and 0.5 */
     if (2*(ht->keyCount) > ht->numBuckets) {
         poolHashResize(pool, ht->numBuckets * 2);
     }
diff --git a/rpmio/rpmutil.h b/rpmio/rpmutil.h
index 68a21f9..90cc08f 100644
--- a/rpmio/rpmutil.h
+++ b/rpmio/rpmutil.h
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 /*
- * Miscellanous utility macros:
+ * Miscellaneous utility macros:
  * - portability wrappers for various gcc extensions like __attribute__()
  * - ...
  *
diff --git a/scripts/brp-python-bytecompile b/scripts/brp-python-bytecompile
index 333ef94..af6378e 100644
--- a/scripts/brp-python-bytecompile
+++ b/scripts/brp-python-bytecompile
@@ -23,15 +23,15 @@ fi
 # .pyc/.pyo files embed a "magic" value, identifying the ABI version of Python
 # bytecode that they are for.
 #
-# The files below RPM_BUILD_ROOT could be targetting multiple versions of
+# The files below RPM_BUILD_ROOT could be targeting multiple versions of
 # python (e.g. a single build that emits several subpackages e.g. a
 # python26-foo subpackage, a python31-foo subpackage etc)
 #
 # Support this by assuming that below each /usr/lib/python$VERSION/, all
 # .pyc/.pyo files are to be compiled for /usr/bin/python$VERSION.
 # 
-# For example, below /usr/lib/python2.6/, we're targetting /usr/bin/python2.6
-# and below /usr/lib/python3.1/, we're targetting /usr/bin/python3.1
+# For example, below /usr/lib/python2.6/, we're targeting /usr/bin/python2.6
+# and below /usr/lib/python3.1/, we're targeting /usr/bin/python3.1
 
 shopt -s nullglob
 for python_libdir in "$RPM_BUILD_ROOT"/usr/lib{,64}/python[0-9].[0-9]/ ;
diff --git a/scripts/perl.prov b/scripts/perl.prov
index 400cb19..af37328 100755
--- a/scripts/perl.prov
+++ b/scripts/perl.prov
@@ -19,7 +19,7 @@
 
 # a simple script to print the proper name for perl libraries.
 
-# To save development time I do not parse the perl grammmar but
+# To save development time I do not parse the perl grammar but
 # instead just lex it looking for what I want.  I take special care to
 # ignore comments and pod's.
 
@@ -65,7 +65,7 @@ foreach $module (sort keys %require) {
     print "perl($module)\n";
   } else {
 
-    # I am not using rpm3.0 so I do not want spaces arround my
+    # I am not using rpm3.0 so I do not want spaces around my
     # operators. Also I will need to change the processing of the
     # $RPM_* variable when I upgrade.
 
diff --git a/scripts/rpm_fulldb_update b/scripts/rpm_fulldb_update
index eb49836..5fb1886 100644
--- a/scripts/rpm_fulldb_update
+++ b/scripts/rpm_fulldb_update
@@ -5,7 +5,7 @@
 # version of every branch of each package found in the package
 # repositories.  The database is useful for querying since it is as if
 # you have installed all these packages into your system.  You can
-# find which packages hold a file or which packages satify a
+# find which packages hold a file or which packages satisfy a
 # dependency.  We are only load the information from the packages and
 # do not save the contents of the packages into the file system.
 
@@ -13,7 +13,7 @@
 # rpm version by convention.  We build the same packages for many
 # different projects.  Each project works on its own branch and may
 # have different source code for the same rpm.  The branch name is
-# encouded in the version number of the package followed by a '.'.
+# encoded in the version number of the package followed by a '.'.
 # The full database needs to have the most recent copy of each package
 # on each branch. For example rpm package version "3.43" would be the
 # "43" release of the branch "3" and rpm package version "potato.91"
@@ -48,8 +48,8 @@ sub set_static_vars {
 
 # This functions sets all the static variables which are often
 # configuration parameters.  Since it only sets variables to static
-# quantites it can not fail at run time. Some of these variables are
-# adjusted by parse_args() but asside from that none of these
+# quantities it can not fail at run time. Some of these variables are
+# adjusted by parse_args() but aside from that none of these
 # variables are ever written to. All global variables are defined here
 # so we have a list of them and a comment of what they are for.
 
@@ -65,7 +65,7 @@ sub set_static_vars {
   $PACKAGE_PAT ='(.*)-([^-]+)-([^-]+).solaris2.6-\w*.rpm';
 
   # packages which will end up in the database match this pattern
-  # currently we are not retricting the packages which go into the
+  # currently we are not restricting the packages which go into the
   # database.
 
   $PICKLIST_PAT = '.';
@@ -205,7 +205,7 @@ sub get_latest_fqn {
 
   # the $BY_NAME datastructure is fairly good but the list can not be
   # sorted right. Sort again using the Schwartzian Transform as
-  # discribed in perlfaq4
+  # described in perlfaq4
 
   my @sorted = sort {
 
@@ -357,7 +357,7 @@ EOF
     }
   }
 
-  # do the update as close to atomically as is practicale.
+  # do the update as close to atomically as is practical.
 
   system("rm", "-rf", $RPM_DB_DIR,);
   ($?) && 
diff --git a/scripts/rpmsync b/scripts/rpmsync
index 528c15e..85db6c9 100644
--- a/scripts/rpmsync
+++ b/scripts/rpmsync
@@ -32,8 +32,8 @@ use Sys::Syslog;
 
 # fqn is "fully qualified name"
 
-# The state of the system is a orderd list (topologically sorted by
-# dependendencies) of fqn's. The list may contain additional RPM flags
+# The state of the system is an ordered list (topologically sorted by
+# dependencies) of fqn's. The list may contain additional RPM flags
 # to be used on a particular list entry.
 
 # we are going to compare two states the actual state of the machine
@@ -59,11 +59,11 @@ Usage:
 		[--help] [--version]
 
 
-Required Aguments:
+Required Arguments:
 
 
 --test		test what an update would change.  Compare the installed 
-		packges with the packages listed in the manifest file.  
+		packages with the packages listed in the manifest file.  
 		This option will show what commands would be executed if 
 		we were to run an update without actually changing anything.
 		When an --update finishes it automatically runs --test 
@@ -80,14 +80,14 @@ Required Aguments:
 		later version number then the previous packages.
 
 --rollback	Rollback a previously installed update.  This command 
-		requires that the pervious manfest file be reinstalled.  All 
+		requires that the previous manifest file be reinstalled.  All 
 		update commands are run in the reverse order from the --update,
 		this ensures that the packages are undone exactly as they were
 		installed.
 
 --force		Ensure that the packages installed on the machine are 
 		exactly those packages listed in the manifest file and that no
-		installed files are currpted.  First each package in the 
+		installed files are corrupted.  First each package in the 
 		manifest file is installed using --force (even if it is already
 		installed) then each package which is installed but not listed
 		in the manifest list is removed from the machine.
@@ -100,15 +100,15 @@ Required Aguments:
 		     manner.
 
 
-Optional Aguments:
+Optional Arguments:
 
 
 --rpm_args	Specify additional arguments to pass to rpm for all package
 		operations.  This option is used by both the update and erase
 		commands.  This option can appear more then once on the
-		command line and the concatination of all options will be sent
-		to rpm.  This option should not be need somtimes it is useful,
-		in an emergency, to install packges with broken dependencies
+		command line and the concatenation of all options will be sent
+		to rpm.  This option should not be need sometimes it is useful,
+		in an emergency, to install packages with broken dependencies
 		or packages with duplicate files.  This is a quick way of 
 		getting the --nodeps and --force and any other needed 
 		arguments to rpm. 
@@ -142,8 +142,8 @@ Optional Aguments:
 This program is used to ensure that the RPM packages installed on a
 system match the list of packages in a manifest.  The package list
 looks like the output of 'rpm -qa' but is required to be in a
-tolological order.  If special flags are needed for particular
-packages (like --nodeps or --force or --oldpackage or --noscriopts or
+topological order.  If special flags are needed for particular
+packages (like --nodeps or --force or --oldpackage or --noscripts or
 --root <dir> or --relocate oldpath=newpath or --rcfile <file>) they
 can be added on the line after package name with a space separating
 the two.  Shell style comments (starting with \# and lasting till the
@@ -153,7 +153,7 @@ file is $MANIFEST_FILE.
 It is expected that most updates will use the --update command with
 --force saved for those rare situations where the machine is known to
 be in a very bad state or there are installed packages which are
-currupted.
+corrupted.
 
 
 
@@ -384,7 +384,7 @@ sub parse_fqn {
 
 sub system3 {
 
-# Lanuch a new child and wait for it to die.  This is like a call to
+# Launch a new child and wait for it to die.  This is like a call to
 # system but we get the stdout and stderr in addition to $?.
 
 # call the function like this 
@@ -394,7 +394,7 @@ sub system3 {
 #     'cmd_vec' => [],
 #     'stdin_str' => '',
 #     'log_cmds'=> '';
-#     'ingore_error' => ''
+#     'ignore_error' => ''
 #      );
 
 # cmd_vec is a command to run in execv format.  It is a list not a
@@ -407,7 +407,7 @@ sub system3 {
 
 # open3 signals all errors through a die so will I.  If the command
 # exits with nonzero wait_status then system3 calls die.  This feature
-# can be turned of fby setting ignore_errors.
+# can be turned of by setting ignore_error.
 
 # the system3 function returns:
 
@@ -422,7 +422,7 @@ sub system3 {
   my ($log_cmds, $ignore_error, $cmd_ref, $stdin) = @_;
 
 #  if ( ! ( (-x $args{'cmd_vec'}->[0]) && (-f $args{'cmd_vec'}->[0]) ) ) {
-#    die ("Command not exectuable: '$args{'cmd_vec'}->[0]',\n");
+#    die ("Command not executable: '$args{'cmd_vec'}->[0]',\n");
 #  }      
   
   my $info ="executing: '@{ $args{'cmd_vec'} }',\n";
@@ -487,7 +487,7 @@ sub system3 {
   # wait for child to die, but keep clearing out stdout and stderr
   # buffers for process so we do not deadlock.  
 
-  # WE seem to be loosing childrens signals occasionally, so actively
+  # WE seem to be losing childrens' signals occasionally, so actively
   # check if the child is alive.
 
   while ($reaped_pid != $child_pid) {    
@@ -597,7 +597,7 @@ sub get_rpm_info {
 
 sub remove_extra_packages {
 
-  # arguments are not used but allowed for symetry with other
+  # arguments are not used but allowed for symmetry with other
   # functions
 
   my(@pkg_list) = @_;
@@ -618,7 +618,7 @@ sub remove_extra_packages {
 
   # We would like to remove all packages in reverse topological order.
   # I have no way of finding out what that order is, so I use a single
-  # command which removes all pacakges.  RPM will figure out the
+  # command which removes all packages.  RPM will figure out the
   # correct order at run time.  This will cause us to reach the
   # command line limit if the list of packages to remove is large
   # enough.
@@ -860,7 +860,7 @@ EOF
 
 
 # check what running with --update would do.  If I were to write a
-# check_rollback_packages the output would be similar but the packge
+# check_rollback_packages the output would be similar but the package
 # update order would be reversed.
 
 sub test_update {
@@ -914,7 +914,7 @@ sub nonblock {
 
 
 sub mkdir_R {
-# a recusive mkdir function
+# a recursive mkdir function
 
   my ($dir, $mode) = @_;
   my @dir = split('/', $dir);
@@ -1128,8 +1128,8 @@ sub set_static_vars {
 
 # This functions sets all the static variables which are often
 # configuration parameters.  Since it only sets variables to static
-# quantites it can not fail at run time. Some of these variables are
-# adjusted by parse_args() but asside from that none of these
+# quantities it can not fail at run time. Some of these variables are
+# adjusted by parse_args() but aside from that none of these
 # variables are ever written to. All global variables are defined here
 # so we have a list of them and a comment of what they are for.
   
@@ -1393,7 +1393,7 @@ sub get_package_list  {
 
 # load the $package_file into memory
 
-# this fucntion must follow get_env() since we need $skip_check to be
+# this function must follow get_env() since we need $skip_check to be
 # respected, if set.
 
   my ($package_file) = @_;
@@ -1446,7 +1446,7 @@ sub get_package_hash  {
 
 # load the $package_file into memory
 
-# this fucntion must follow get_env() since we need $skip_check to be
+# this function must follow get_env() since we need $skip_check to be
 # respected, if set.
 
   my $package_file = @_;
diff --git a/scripts/vpkg-provides.sh b/scripts/vpkg-provides.sh
index c15f080..0b86d4b 100755
--- a/scripts/vpkg-provides.sh
+++ b/scripts/vpkg-provides.sh
@@ -51,7 +51,7 @@ usage="$usage\t[--find_provides '/path/to/find-provides']\n"
 usage="$usage\t[--shlib_dirs 'dirs:which:contain:shared:libs']\n"
 usage="$usage\t[--ignore_dirs 'grep-E|pattern|of|paths|to|ignore']\n"
 
-# these two should be unnessary as the regular dependency analysis
+# these two should be unnecessary as the regular dependency analysis
 # should take care of interpreters as well as shared libraries.
 
 usage="$usage\t[--interp_dirs 'dirs:which:contain:interpreters']\n"
@@ -67,10 +67,10 @@ sum_cmd="xargs cksum"
 date=`date`
 hostname=`uname -n`
 
-# if some subdirectories of the system directories needs to be ignored
+# if some subdirectories of the system directories need to be ignored
 # (eg /usr/local is a subdirectory of /usr but should not be part of
 # the virtual package) then call this script with ignore_dirs set to a
-# valid grep -E pattern which discribes the directories to ignored.
+# valid grep -E pattern which describes the directories to ignore.
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/usr/bsd
 export PATH
@@ -207,7 +207,7 @@ do
 done
 
 
-# consistancy checks on the arguments
+# consistency checks on the arguments
 
 if [ ! -f $spec_header ]; then
 	echo "You must pass me the full path to the partial spec file"
@@ -294,7 +294,7 @@ cat $spec_header
 } | sed -e 's/%/%%/g'
 
 #
-# Output the discription of the spec file
+# Output the description of the spec file
 #
 
 cat <<_EIEIO_
diff --git a/tests/rpmpython.at b/tests/rpmpython.at
index 1ccbb70..86a5d2f 100644
--- a/tests/rpmpython.at
+++ b/tests/rpmpython.at
@@ -54,7 +54,7 @@ for iot in [ 'fpio', 'fdio', 'ufdio', 'gzdio' ]:
     rdata = fd.read()
     if rdata != data:
         myprint('%s read fail (got %d bytes)' % (iot, len(rdata), rdata))
-    # compressed io types cant seek
+    # compressed io types can't seek
     if iot == 'ufdio':
         fd.seek(0)
     else:
-- 
1.7.11.7

More information about the Rpm-maint mailing list