Revert OL modifications

1000-Replace-upstream-reference.patch

@@ -1,24 +0,0 @@
-From eabfc409e6c79367567d465fec270b30c52a683f Mon Feb 23 00:00:00 2001
-From: Akshata Konala <akshata.konala@oracle.com>
-Date: Mon, 23 Feb 2026 06:03:07 -0700
-Subject: [PATCH] Replace upstream reference
-Signed-off-by: Akshata Konala <akshata.konala@oracle.com>
----
- postgresql-setup-8.9/bin/postgresql-setup.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/postgresql-setup-8.9/bin/postgresql-setup.in b/postgresql-setup-8.9/bin/postgresql-setup.in
-index cf9ed24..cfa3e1e 100644
---- a/postgresql-setup-8.9/bin/postgresql-setup.in
-+++ b/postgresql-setup-8.9/bin/postgresql-setup.in
-@@ -287,7 +287,7 @@ upgrade()
-     }
- 
-     test x"$upgradefrom_redhat_sockets_hack" = xyes && {
--        debug "upgrading from redhat server"
-+        debug "upgrading from OL server"
-         socket_hacks="export REDHAT_PGUPGRADE_FROM_RHEL=yes"
-     }
- 
--- 
-2.31.1

postgresql18.spec

@@ -48,7 +48,7 @@
 Summary: PostgreSQL client programs
 Name: %{majorname}%{majorversion}
 Version: 18.4
-Release: 1.0.1%{?dist}
+Release: 1%{?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.
@@ -95,8 +95,6 @@ Patch9: postgresql-server-pg_config.patch
 # rhbz#1940964
 Patch10: postgresql-datalayout-mismatch-on-s390.patch
 Patch12: postgresql-no-libecpg.patch
-# Oracle Patches
-Patch1000: 1000-Replace-upstream-reference.patch
 
 # This macro is used for package names in the files section
 %if %?postgresql_default
@@ -522,7 +520,6 @@ goal of accelerating analytics queries.
 %endif
 %patch 9 -p1
 %patch 10 -p1
-%patch 1000 -p1
 
 
 %if ! %external_libpq
@@ -1368,9 +1365,6 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
-* Fri Jul 17 2026 EL Errata <el-errata_ww@oracle.com> - 18.4-1.0.1
-- Replace upstream reference
-
 * Wed May 28 2026 Filip Janus <fjanus@redhat.com> - 18.4-1
 - Update to 18.4
 - Fix CVE-2026-6478