From e4370ecc7d1c746c9a40e8f5e455c5ca82b374e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
Date: Thu, 4 Aug 2016 12:04:00 +0200
Subject: [PATCH] Preserve timestamps during 'make install'

Patch provided by Robert Scheck
Resolves: rhbz#1307064
---
 postfix-3.1.1-timestamps.patch | 13 +++++++++++++
 postfix.spec                   |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 postfix-3.1.1-timestamps.patch

diff --git a/postfix-3.1.1-timestamps.patch b/postfix-3.1.1-timestamps.patch
new file mode 100644
index 0000000..6a222f6
--- /dev/null
+++ b/postfix-3.1.1-timestamps.patch
@@ -0,0 +1,13 @@
+diff --git a/postfix-install b/postfix-install
+index 922402b..586e5b0 100644
+--- a/postfix-install
++++ b/postfix-install
+@@ -304,7 +304,7 @@ compare_or_replace() {
+     (cmp $src $dst >/dev/null 2>&1 && echo Skipping $dst...) || {
+ 	echo Updating $dst...
+ 	rm -f $tempdir/junk || exit 1
+-	cp $src $tempdir/junk || exit 1
++	cp -p $src $tempdir/junk || exit 1
+ 	mv -f $tempdir/junk $dst || exit 1
+ 	test -z "$owner" || chown $owner $dst || exit 1
+ 	test -z "$group" || chgrp $group $dst || exit 1
diff --git a/postfix.spec b/postfix.spec
index 56b7e72..448c506 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -42,7 +42,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 3.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -85,6 +85,7 @@ Patch1: postfix-3.0.0-config.patch
 Patch2: postfix-3.1.0-files.patch
 Patch3: postfix-3.1.0-alternatives.patch
 Patch4: postfix-3.1.0-large-fs.patch
+Patch5: postfix-3.1.1-timestamps.patch
 Patch9: pflogsumm-1.1.3-datecalc.patch
 
 # Optional patches - set the appropriate environment variables to include
@@ -209,6 +210,7 @@ maps with Postfix, you need this.
 %patch2 -p1 -b .files
 %patch3 -p1 -b .alternatives
 %patch4 -p1 -b .large-fs
+%patch5 -p1 -b .timestamps
 
 # Change DEF_SHLIB_DIR according to build host
 sed -i \
@@ -732,6 +734,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 04 2016 Ondřej Lysoněk <olysonek@redhat.com> - 2:3.1.1-3
+- Preserve timestamps during 'make install'
+  Patch provided by Robert Scheck
+  Resolves: rhbz#1307064
+
 * Wed Jun 29 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.1.1-2
 - Hardened systemd unit file
   Resolves: rhbz#1350941