From ffca428c073444d9b13bdf6ac3153b07a692f918 Mon Sep 17 00:00:00 2001
From: Devrim Gunduz <devrim@gunduz.org>
Date: Wed, 19 Mar 2025 03:18:55 +0300
Subject: [PATCH] jdbc_fdw: Update patch for new version (likely WIP)

---
 .../jdbc_fdw/main/jdbc_fdw-pgdg-rpm.patch     | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/rpm/redhat/main/non-common/jdbc_fdw/main/jdbc_fdw-pgdg-rpm.patch b/rpm/redhat/main/non-common/jdbc_fdw/main/jdbc_fdw-pgdg-rpm.patch
index c35dbdc6b..43f89eeb0 100644
--- a/rpm/redhat/main/non-common/jdbc_fdw/main/jdbc_fdw-pgdg-rpm.patch
+++ b/rpm/redhat/main/non-common/jdbc_fdw/main/jdbc_fdw-pgdg-rpm.patch
@@ -1,19 +1,17 @@
---- Makefile.old	2024-08-21 12:05:07.592942364 +0300
-+++ Makefile	2024-08-21 12:36:21.454636100 +0300
-@@ -13,23 +13,23 @@
+--- Makefile.old	2025-03-18 17:12:08.476686135 +0300
++++ Makefile	2025-03-18 17:24:02.825224306 +0300
+@@ -13,22 +13,22 @@
  
  JDBC_CONFIG = jdbc_config
  
 -LIBDIR=/usr/lib64/
-+LIBDIR=/usr/lib/jvm/jre-1.8.0-openjdk/lib/amd64/server
++LIBDIR=/etc/alternatives/java_sdk_openjdk/lib/server
  
 -SHLIB_LINK += -L$(LIBDIR) -ljvm
 +SHLIB_LINK += -L$(LIBDIR) -Wl,-rpath,$(LIBDIR) -ljvm
  
  UNAME = $(shell uname)
  
- TRGTS = JAVAFILES
- 
  JAVA_SOURCES = \
 -	JDBCUtils.java \
 -	JDBCDriverLoader.java \
@@ -24,11 +22,11 @@
 +	$(srcdir)/JDBCConnection.java \
 +	$(srcdir)/resultSetInfo.java
  
--PG_CPPFLAGS=-D'PKG_LIB_DIR=$(pkglibdir)' -I$(libpq_srcdir)
-+PG_CPPFLAGS=-D'PKG_LIB_DIR=$(shell pg_config --sharedir)/extension' -I$(libpq_srcdir)
- 
--JFLAGS = -d $(pkglibdir)
-+JFLAGS = #-d $(pkglibdir)
+ # Generate a list of .class files corresponding to .java files
+ JAVA_CLASSES = $(patsubst %.java,%.class,$(JAVA_SOURCES))
  
- all:$(TRGTS)
+-PG_CPPFLAGS=-D'SHARE_EXT_DIR=$(datadir)/extension' -I$(libpq_srcdir)
++PG_CPPFLAGS=-D'PKG_LIB_DIR=$(shell pg_config --sharedir)/extension' -I$(libpq_srcdir)
  
+ # Target to compile all Java source files
+ all:$(JAVA_CLASSES)
-- 
2.39.5