From b8506217da0a34c791b06d4c2b1166acebf14680 Mon Sep 17 00:00:00 2001
From: panchenbo <panchenbo@kylinsec.com.cn>
Date: Thu, 17 Aug 2023 15:48:59 +0800
Subject: [PATCH] fix sw_64 patch error and remove --no-discard-stderr

(cherry picked from commit 17ffea21678962264544c74d48b22c7b2bb3ad74)
---
 postgresql-13.3-sw.patch | 14 +-------------
 postgresql.spec          |  5 ++++-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/postgresql-13.3-sw.patch b/postgresql-13.3-sw.patch
index f3f71c7..8d60909 100755
--- a/postgresql-13.3-sw.patch
+++ b/postgresql-13.3-sw.patch
@@ -10,18 +10,6 @@ diff -Naur postgresql-13.3.org/contrib/pgcrypto/crypt-blowfish.c postgresql-13.3
  #define BF_ASM				0
  #define BF_SCALE			1
  #else
-diff -Naur postgresql-13.3.org/postgresql-setup-8.5/Makefile.in postgresql-13.3.sw/postgresql-setup-8.5/Makefile.in
---- postgresql-13.3.org/postgresql-setup-8.5/Makefile.in	2022-09-16 11:31:14.930000000 +0800
-+++ postgresql-13.3.sw/postgresql-setup-8.5/Makefile.in	2022-09-16 11:37:09.260000000 +0800
-@@ -459,7 +459,7 @@
- newunit = sbin/$(NAME_BINARYBASE)-new-systemd-unit
- newunit_in = sbin/new-systemd-unit.in
- @WANT_SYSVINIT_FALSE@sbin_SCRIPTS = $(newunit)
--HELP2MAN = $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run help2man
-+HELP2MAN = $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run help2man --no-discard-stderr
- 
- # The help2man call
- # =================
 diff -Naur postgresql-13.3.org/src/include/port/atomics/arch-sw_64.h postgresql-13.3.sw/src/include/port/atomics/arch-sw_64.h
 --- postgresql-13.3.org/src/include/port/atomics/arch-sw_64.h	1970-01-01 08:00:00.000000000 +0800
 +++ postgresql-13.3.sw/src/include/port/atomics/arch-sw_64.h	2022-09-16 13:37:10.630000000 +0800
@@ -59,7 +47,7 @@ diff -Naur postgresql-13.3.org/src/include/port/atomics.h postgresql-13.3.sw/src
  #include "port/atomics/arch-arm.h"
  #elif defined(__i386__) || defined(__i386) || defined(__x86_64__)
  #include "port/atomics/arch-x86.h"
-+#elif defined(__sw_646__) 
++#elif defined(__sw_64__)
 +#include "port/atomics/arch-sw_64.h"
  #elif defined(__ia64__) || defined(__ia64)
  #include "port/atomics/arch-ia64.h"
diff --git a/postgresql.spec b/postgresql.spec
index a080707..29e9250 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -36,7 +36,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
 Version: %{majorversion}.12
-Release: 1
+Release: 2
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -1301,6 +1301,9 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Thu Aug 17 2023 panchenbo <panchenbo@kylinsec.com.cn> - 13.12-2
+- fix sw_64 patch error and remove --no-discard-stderr
+
 * Fri Aug 11 2023 Funda Wang <fundawang@yeah.net> - 13.12-1
 - New version 13.12
 
-- 
Gitee