[postgresql] postgresql-setup: typos

[Pavel Raiskup]

commit 6d2de0b6b6baa2b2b33bb33ee648f4fe13894d81
Author: Pavel Raiskup <praiskup at redhat.com>
Date:   Thu Jan 23 10:56:07 2014 +0100

    postgresql-setup: typos
    
    Version: 9.3.2-7

 postgresql-setup |   13 +++++++------
 postgresql.spec  |    6 +++++-
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/postgresql-setup b/postgresql-setup
index b30550a..acf07f7 100755
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -8,16 +8,16 @@ test x"$PGSETUP_DEBUG" != x && set -x
 # Note: the specfile inserts the correct value during package build
 PGVERSION=xxxx
 
+# PGMAJORVERSION is the major version, e.g. 9.0
+PGMAJORVERSION=xxxx
+
 # PGENGINE is the directory containing the postmaster executable
-# Note: the specfile inserts the correct value during package build
 PGENGINE=xxxx
 
 # PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-# Note: the specfile inserts the correct value during package build
 PREVMAJORVERSION=xxxx
 
 # PREVPGENGINE is the directory containing the previous postmaster executable
-# Note: the specfile inserts the correct value during package build
 PREVPGENGINE=xxxx
 
 # Absorb configuration settings from the specified systemd service file,
@@ -44,8 +44,9 @@ Available operation mode:
   initdb        Create a new PostgreSQL database cluster.  This is usually the
                 first action you perform after PostgreSQL server installation.
   upgrade       Upgrade PostgreSQL database cluster to be usable with new
-                server.  Use this if upgraded to newer PostgreSQL major version,
-                e.g. from 9.1 to 9.2.
+                server.  Use this if you upgraded your PostgreSQL server to
+                newer major version (currently from $PREVMAJORVERSION \
+to $PGMAJORVERSION).
 
 Environment:
   PGSETUP_INITDB_OPTIONS     Options carried by this variable are passed to
@@ -236,7 +237,7 @@ upgrade(){
     if [ $script_result -eq 0 ]; then
         echo $"OK"
         echo
-        echo $"The configuration files was replaced by default configuration."
+        echo $"The configuration files were replaced by default configuration."
         echo $"The previous configuration and data are stored in folder"
         echo $PGDATAOLD.
     else
diff --git a/postgresql.spec b/postgresql.spec
index 8d894a3..82292a1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.3
 Version: 9.3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -361,6 +361,7 @@ find . -type f -name .gitignore | xargs rm
 
 # prep the setup script, including insertion of some values it needs
 sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
+	-e 's|^PGMAJORVERSION=.*$|PGMAJORVERSION=%{majorversion}|' \
 	-e 's|^PGENGINE=.*$|PGENGINE=%{_bindir}|' \
 	-e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
 	-e 's|^PREVPGENGINE=.*$|PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin|' \
@@ -1130,6 +1131,9 @@ fi
 %endif
 
 %changelog
+* Thu Jan 23 2014 Pavel Raiskup <praiskup at redhat.com> - 9.3.2-7
+- postgresql-setup: typos
+
 * Tue Jan 21 2014 Pavel Raiskup <praiskup at redhat.com> - 9.3.2-6
 - add PGSETUP_PGUPGRADE_OPTIONS env var for postgresql-setup