]> granicus.if.org Git - postgis/commitdiff
Necesarry patches used to build PostGIS RPMs.
authorDevrim GÜNDÜZ <devrim@gunduz.org>
Tue, 27 Sep 2005 21:12:11 +0000 (21:12 +0000)
committerDevrim GÜNDÜZ <devrim@gunduz.org>
Tue, 27 Sep 2005 21:12:11 +0000 (21:12 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@1942 b70326c6-7e19-0410-871a-916f4a2858ee

extras/rpm/patches/filter-requires-perl-Pg.sh [new file with mode: 0755]
extras/rpm/patches/postgis-jdbc2-makefile.patch [new file with mode: 0644]
extras/rpm/patches/postgis-jdbcdedectver.sh [new file with mode: 0644]
extras/rpm/patches/postgis-version.config.patch [new file with mode: 0644]

diff --git a/extras/rpm/patches/filter-requires-perl-Pg.sh b/extras/rpm/patches/filter-requires-perl-Pg.sh
new file mode 100755 (executable)
index 0000000..f37557f
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/lib/rpm/perl.req $* | grep -v 'perl(Pg'
diff --git a/extras/rpm/patches/postgis-jdbc2-makefile.patch b/extras/rpm/patches/postgis-jdbc2-makefile.patch
new file mode 100644 (file)
index 0000000..33353ba
--- /dev/null
@@ -0,0 +1,11 @@
+--- jdbc2/Makefile.old 2005-03-30 18:24:40.000000000 +0300
++++ jdbc2/Makefile     2005-04-16 18:43:00.984765168 +0300
+@@ -147,7 +148,7 @@
+ # include version numbers from central repository
+ include ../Version.config
+-VERSION=$(JDBC_MAJOR_VERSION)_$(JDBC_MINOR_VERSION)_$(JDBC_MICRO_VERSION)
++VERSION=$(JDBC_MAJOR_VERSION).$(JDBC_MINOR_VERSION).$(JDBC_MICRO_VERSION)
+ VERSIONPATH=$(BUILD)/org/postgis
+ VERSIONTARGET=$(VERSIONPATH)/version.properties
diff --git a/extras/rpm/patches/postgis-jdbcdedectver.sh b/extras/rpm/patches/postgis-jdbcdedectver.sh
new file mode 100644 (file)
index 0000000..ddb9de0
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/bash
+JDBC_VERSION_RPM=`rpm -ql postgresql-jdbc| grep 'jdbc2.jar$'|awk -F '/' '{print $5}'`
+sed 's/postgresql.jar/'${JDBC_VERSION_RPM}'/g' $MAKEFILE_DIR/Makefile > $MAKEFILE_DIR/Makefile.new
+mv -f $MAKEFILE_DIR/Makefile.new $MAKEFILE_DIR/Makefile
diff --git a/extras/rpm/patches/postgis-version.config.patch b/extras/rpm/patches/postgis-version.config.patch
new file mode 100644 (file)
index 0000000..0113291
--- /dev/null
@@ -0,0 +1,8 @@
+--- Version.config.old 2005-05-27 08:24:59.435126934 +0300
++++ Version.config     2005-05-27 08:25:01.992881501 +0300
+@@ -12,4 +12,4 @@
+ # JDBC code version
+ JDBC_MAJOR_VERSION=1
+ JDBC_MINOR_VERSION=0
+-JDBC_MICRO_VERSION=0
++JDBC_MICRO_VERSION=1