From b66f190455bc107029a053a736d45912854f1729 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 25 Sep 2015 13:54:46 +0200
Subject: [PATCH] postgresql-setup: rebase to 3.4

Resolves: rhbz#1265319, rhbz#1247477
Version: 9.4.4-6
---
 .gitignore      | 2 +-
 postgresql.spec | 9 ++++++---
 sources         | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 46d4c11..b135bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/postgresql-setup-3.3.tar.gz
+/postgresql-setup-3.4.tar.gz
 /postgresql-9.3.9.tar.bz2
 /postgresql-9.3.9.tar.bz2.sha256
 /postgresql-9.4.4.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index 8db5673..2aecc04 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.4
 Version: 9.4.4
-Release: 5%{?dist}
+Release: 6%{?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.
@@ -85,7 +85,7 @@ Url: http://www.postgresql.org/
 %global prevversion 9.3.9
 %global prevmajorversion 9.3
 
-%global setup_version 3.3
+%global setup_version 3.4
 
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
 # The PDF file is generated by generate-pdf.sh, which see for comments
@@ -122,7 +122,7 @@ Patch7: postgresql-perl-5.22-test-fail.patch
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
 BuildRequires: perl(ExtUtils::Embed), perl-devel
 BuildRequires: readline-devel zlib-devel
-BuildRequires: systemd-units
+BuildRequires: systemd-units util-linux
 
 # postgresql-setup build requires
 BuildRequires: m4 elinks docbook-utils help2man
@@ -1194,6 +1194,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 25 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.4-6
+- postgresql-setup rebase to 3.4 (rhbz#1265319, rhbz#1247477)
+
 * Thu Sep 17 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.4-5
 - enable hardening (safe for kernel 4.1+) (see rhbz#952946 comment #24)
 
diff --git a/sources b/sources
index 3c534dc..a681b30 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-4333e467db490f5721452640d2bf9cd2  postgresql-setup-3.3.tar.gz
+1b04cb359940bcc21ca4512c67e83290  postgresql-setup-3.4.tar.gz
 41cd45d8f9d32c900ff5dafb5946d31f  postgresql-9.3.9.tar.bz2
 ed0fab6010385125b11758ace4d4c08f  postgresql-9.3.9.tar.bz2.sha256
 1fe952c44ed26d7e6a335cf991a9c1c6  postgresql-9.4.4.tar.bz2