Fix classpath

4 files changed, 23 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5d2b39b7b63..538d1a67d352 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = jdbc_fdw
 	pkgdesc = PostgreSQL Foreign Data Wrapper (FDW) for remote databases using JDBC
 	pkgver = 0.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/pgspider/jdbc_fdw
+	install = jdbc_fdw.install
 	arch = x86_64
 	license = PostgreSQL
 	makedepends = jdk8-openjdk
 	depends = postgresql
+	depends = jre8-openjdk
 	source = https://github.com/pgspider/jdbc_fdw/archive/refs/tags/v0.1.0.tar.gz
 	source = openjdk8.patch
 	sha256sums = 552fc5cb2f27ae48182bf7fe24a2c993c4a6dacd91d86cfaeb501c45586d2e27
-	sha256sums = fe77b21484362c837f6b76cea2eb4748dd08c084965afa011eff20eb407a7cd5
+	sha256sums = 3737594028b022e459e2cc912afeea00584540c41bb6e635a73681549c6e5cd1
 
 pkgname = jdbc_fdw
diff --git a/PKGBUILD b/PKGBUILD
index ba29f44ad17d..60728f5fd999 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,18 @@
 
 pkgname=jdbc_fdw
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PostgreSQL Foreign Data Wrapper (FDW) for remote databases using JDBC"
 arch=('x86_64')
 url="https://github.com/pgspider/jdbc_fdw"
 license=('PostgreSQL')
-depends=('postgresql')
+depends=('postgresql' 'jre8-openjdk')
 makedepends=('jdk8-openjdk')
+install=jdbc_fdw.install
 source=("https://github.com/pgspider/jdbc_fdw/archive/refs/tags/v${pkgver}.tar.gz"
-         "openjdk8.patch")
+        "openjdk8.patch")
 sha256sums=('552fc5cb2f27ae48182bf7fe24a2c993c4a6dacd91d86cfaeb501c45586d2e27'
-            'fe77b21484362c837f6b76cea2eb4748dd08c084965afa011eff20eb407a7cd5')
+            '3737594028b022e459e2cc912afeea00584540c41bb6e635a73681549c6e5cd1')
 
 prepare(){
   cd jdbc_fdw-${pkgver}
@@ -23,13 +24,10 @@ prepare(){
 package() {
   cd jdbc_fdw-${pkgver}
 
-  make USE_PGXS=1 pkglibdir=./ DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib install
+  make DESTDIR=${pkgdir} USE_PGXS=1 install
 
   install -Dm644 JDBCDriverLoader.class ${pkgdir}/usr/lib/postgresql/JDBCDriverLoader.class
   install -Dm644 JDBCUtils.class ${pkgdir}/usr/lib/postgresql/JDBCUtils.class
   install -Dm644 resultSetInfo.class ${pkgdir}/usr/lib/postgresql/resultSetInfo.class
   install -Dm0644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  mv ${pkgdir}/../jdbc_fdw./* ${pkgdir}/usr/lib/postgresql/
-  rmdir ${pkgdir}/../jdbc_fdw.
 }
diff --git a/jdbc_fdw.install b/jdbc_fdw.install
new file mode 100644
index 000000000000..6df6b819b16a
--- /dev/null
+++ b/jdbc_fdw.install
@@ -0,0 +1,5 @@
+post_install() {
+  echo "Please override your postgresql service with the following"
+  echo "  [Service]"
+  echo "  Environment=\"LD_LIBRARY_PATH=/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/server\""
+}
diff --git a/openjdk8.patch b/openjdk8.patch
index 4b34985d96c3..9d5397889c5f 100644
--- a/openjdk8.patch
+++ b/openjdk8.patch
@@ -1,5 +1,5 @@
 --- a/Makefile	2021-12-23 10:15:03.000000000 +0200
-+++ b/Makefile	2022-03-03 12:00:19.621310928 +0200
++++ b/Makefile	2022-03-06 16:36:03.777862228 +0200
 @@ -13,7 +13,7 @@
  
  JDBC_CONFIG = jdbc_config
@@ -9,7 +9,13 @@
  
  SHLIB_LINK += -L$(LIBDIR) -ljvm
  
-@@ -32,7 +32,7 @@
+@@ -27,12 +27,12 @@
+  
+ PG_CPPFLAGS=-D'PKG_LIB_DIR=$(pkglibdir)' -I$(libpq_srcdir)
+ 
+-JFLAGS = -d $(pkglibdir)
++JFLAGS = -d .
+ 
  all:$(TRGTS)
  
  JAVAFILES: