From e2ce80082bb7c09277d55435206da3d3017e7be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 22 Jul 2015 18:42:36 +0200 Subject: [PATCH] New version Resolves: rhbz#1245183 - Dropped linux4 patch (not needed) - Defuzzified alternatives patch --- postfix-3.0.1-linux4.patch | 19 ------------------- ....patch => postfix-3.0.2-alternatives.patch | 4 ++-- postfix.spec | 19 +++++++++++-------- sources | 2 +- 4 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 postfix-3.0.1-linux4.patch rename postfix-3.0.0-alternatives.patch => postfix-3.0.2-alternatives.patch (92%) diff --git a/postfix-3.0.1-linux4.patch b/postfix-3.0.1-linux4.patch deleted file mode 100644 index bc1bc84..0000000 --- a/postfix-3.0.1-linux4.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch allows the postfix build system to accept building on Linux 4.* - -Even for Linux 4.x systems, it sets SYSTYPE variable to Linux3 because -I am not sure if I'd have to change other part of the build system to -make it cope with the new Linux 4.x. I guess I'll try in subsequent -patch to set the SYSTYPE properly and see what breaks. For now, this -seems to work. - ---- postfix-3.0.1/makedefs 2015-04-26 19:07:31.924108509 +0200 -+++ postfix-3.0.1/makedefs.dodji 2015-04-26 19:06:22.678638335 +0200 -@@ -500,7 +500,7 @@ - : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} - : ${PLUGIN_LD="${CC-gcc} -shared"} - ;; -- Linux.3*) SYSTYPE=LINUX3 -+ Linux.3*|Linux.4*) SYSTYPE=LINUX3 - case "$CCARGS" in - *-DNO_DB*) ;; - *-DHAS_DB*) ;; diff --git a/postfix-3.0.0-alternatives.patch b/postfix-3.0.2-alternatives.patch similarity index 92% rename from postfix-3.0.0-alternatives.patch rename to postfix-3.0.2-alternatives.patch index f798350..fb4cf78 100644 --- a/postfix-3.0.0-alternatives.patch +++ b/postfix-3.0.2-alternatives.patch @@ -1,8 +1,8 @@ diff --git a/conf/post-install b/conf/post-install -index b66b147..ba26035 100644 +index d5db260..71e18cf 100644 --- a/conf/post-install +++ b/conf/post-install -@@ -526,6 +526,17 @@ test -n "$create" && { +@@ -530,6 +530,17 @@ test -n "$create" && { case $path in no|no/*) continue;; esac diff --git a/postfix.spec b/postfix.spec index 29cc512..7ee3152 100644 --- a/postfix.spec +++ b/postfix.spec @@ -41,8 +41,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.0.1 -Release: 3%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Epoch: 2 Group: System Environment/Daemons URL: http://www.postfix.org @@ -83,13 +83,11 @@ Source101: postfix-pam.conf Patch1: postfix-3.0.0-config.patch Patch2: postfix-3.0.0-files.patch -Patch3: postfix-3.0.0-alternatives.patch +Patch3: postfix-3.0.2-alternatives.patch Patch4: postfix-3.0.0-large-fs.patch -# The patch below make the package compile on Linux 4.xx -Patch5: postfix-3.0.1-linux4.patch # The patch below resets the global errno variable to 0 before calling # readdir(). This seems to fix bug rhbz#1204139 -Patch6: postfix-3.0.1-reset-errno-before-readdir.patch +Patch5: postfix-3.0.1-reset-errno-before-readdir.patch Patch9: pflogsumm-1.1.3-datecalc.patch # Optional patches - set the appropriate environment variables to include @@ -214,8 +212,7 @@ maps with Postfix, you need this. %patch2 -p1 -b .files %patch3 -p1 -b .alternatives %patch4 -p1 -b .large-fs -%patch5 -p1 -b .linux4 -%patch6 -p1 -b .reset-errno-before-readdir +%patch5 -p1 -b .reset-errno-before-readdir # Change DEF_SHLIB_DIR according to build host sed -i \ @@ -735,6 +732,12 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jul 22 2015 Jaroslav Škarvada - 2:3.0.2-1 +- New version + Resolves: rhbz#1245183 +- Dropped linux4 patch (not needed) +- Defuzzified alternatives patch + * Thu Jun 18 2015 Fedora Release Engineering - 2:3.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index fd94ed6..d8e7fe0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3ec1416e7d4fba9566297c8fcf7a348c postfix-3.0.1.tar.gz 5e3fb28dfb5b7f4a8b6b9bf2abde9542 pflogsumm-1.1.3.tar.gz +d1dc2c23011c222129db3d91aa4f312a postfix-3.0.2.tar.gz