Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit gdal for openSUSE:Factory
Hello community,

here is the log from the commit of package gdal for openSUSE:Factory checked in
at 2019-04-08 20:54:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gdal (Old)
and /work/SRC/openSUSE:Factory/.gdal.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gdal"

Mon Apr 8 20:54:09 2019 rev:39 rq:692315 version:2.4.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2019-03-28
22:47:43.575065180 +0100
+++ /work/SRC/openSUSE:Factory/.gdal.new.3908/gdal.changes 2019-04-08
20:54:16.950601228 +0200
@@ -1,0 +2,13 @@
+Thu Apr 4 16:11:05 UTC 2019 - Bruno Friedmann <bruno@xxxxxxxxxxx>
+
+- Update to version 2.4.1 (52 bugfix release)
+ Full changelog https://trac.osgeo.org/gdal/wiki/Release/2.4.1-News
+- Packaging:
+ + Remove merged upstream patch
+ add-support-for-poppler-0.72.0-and-0.73.0.patch
+ Poppler-revision-version-management.patch
+ + Add pkg-config-libpq.patch upstream issue#1412 pr#1418 wip
+ use pkg-config for libpq
+ + Secure libproj detection with tail -n1
+
+-------------------------------------------------------------------

Old:
----
Poppler-revision-version-management.patch
add-support-for-poppler-0.72.0-and-0.73.0.patch
gdal-2.4.0.tar.xz
gdal-2.4.0.tar.xz.md5

New:
----
gdal-2.4.1.tar.xz
gdal-2.4.1.tar.xz.md5
pkg-config-libpq.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gdal.spec ++++++
--- /var/tmp/diff_new_pack.DFSIW4/_old 2019-04-08 20:54:18.366602268 +0200
+++ /var/tmp/diff_new_pack.DFSIW4/_new 2019-04-08 20:54:18.370602271 +0200
@@ -26,7 +26,7 @@
%bcond_with ecw5_support
%bcond_with fgdb_support
Name: gdal
-Version: 2.4.0
+Version: 2.4.1
Release: 0
Summary: GDAL/OGR - a translator library for raster and vector
geospatial data formats
License: MIT AND BSD-3-Clause AND SUSE-Public-Domain
@@ -37,10 +37,8 @@
Patch0: gdal-perl.patch
# Fix occasional parallel build failure
Patch1: GDALmake.opt.in.patch
-# PATCH-FIX-UPSTREAM --
https://github.com/OSGeo/gdal/commit/d9ff536713c1bcaff00657f5fb9a94f36b92c0d8
-Patch2: Poppler-revision-version-management.patch
-# PATCH-FIX-UPSTREAM --
https://github.com/OSGeo/gdal/commit/d295d0ebc3b41092ad072790c704c772098da210
-Patch3: add-support-for-poppler-0.72.0-and-0.73.0.patch
+# Fix UPSTREAM Patch (pr#1418 in progress) upstream issue #1412
+Patch2: pkg-config-libpq.patch
BuildRequires: KEALib-devel
BuildRequires: blas-devel
BuildRequires: chrpath
@@ -60,7 +58,6 @@
BuildRequires: opencl-headers
BuildRequires: perl-macros
BuildRequires: pkgconfig
-BuildRequires: postgresql-devel
BuildRequires: python-numpy-devel
BuildRequires: python-setuptools
BuildRequires: python3-numpy-devel
@@ -73,6 +70,7 @@
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libpq)
BuildRequires: pkgconfig(libtiff-4) >= 3.6.0
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(netcdf)
@@ -179,13 +177,10 @@

%prep
%setup -q -n %{sourcename}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p2
-%patch3 -p2
+%autopatch -p1

-# Set the right (build) libproj.so version
-PROJSOVER=$(ls -1 %_libdir/libproj.so.?? | awk -F '.' '{print $3}')
+# Set the right (build) libproj.so version, use the upper found version.
+PROJSOVER=$(ls -1 %_libdir/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}')
sed -i "s,# define LIBNAME \"libproj.so\",# define LIBNAME
\"libproj.so.${PROJSOVER}\",g" ogr/ogrct.cpp

# Fix mandir

++++++ gdal-2.4.0.tar.xz -> gdal-2.4.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/gdal/gdal-2.4.0.tar.xz
/work/SRC/openSUSE:Factory/.gdal.new.3908/gdal-2.4.1.tar.xz differ: char 25,
line 1

++++++ gdal-2.4.0.tar.xz.md5 -> gdal-2.4.1.tar.xz.md5 ++++++
--- /work/SRC/openSUSE:Factory/gdal/gdal-2.4.0.tar.xz.md5 2018-12-27
00:30:08.755625987 +0100
+++ /work/SRC/openSUSE:Factory/.gdal.new.3908/gdal-2.4.1.tar.xz.md5
2019-04-08 20:54:16.934601217 +0200
@@ -1 +1 @@
-794096364a50df4bc7c5b710d997b6b4 gdal-2.4.0.tar.xz
+ff98500aab063da563acade884518dfa gdal-2.4.1.tar.xz

++++++ pkg-config-libpq.patch ++++++
diff -rup a/configure.ac b/configure.ac
--- a/configure.ac 2019-03-15 13:30:02.000000000 +0100
+++ b/configure.ac 2019-04-06 21:29:50.153490589 +0200
@@ -1249,12 +1249,10 @@ PG_CONFIG=no

AC_ARG_WITH(pg,
AS_HELP_STRING([--with-pg[=ARG]],
- [Include PostgreSQL GDAL/OGR Support (ARG=path to pg_config)]),,)
+ [Include PostgreSQL GDAL/OGR Support (ARG=yes,no)]),,)

if test "x$with_pg" = "xyes" -o "x$with_pg" = "x" ; then
- AC_PATH_PROG(PG_CONFIG, pg_config, no)
-else
- PG_CONFIG=$with_pg
+ PG_CONFIG=yes
fi

AC_MSG_CHECKING([for PostgreSQL])
@@ -1268,23 +1266,24 @@ if test "x$PG_CONFIG" = "xno" ; then
AC_MSG_RESULT([no])

else
- if test -d ${PG_CONFIG} ; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([--with-pg argument is a directory. It should be the path
to the pg_config script, often somewhere like /usr/local/pgsql/bin/pg_config.])
- fi
-
- if test \! -x ${PG_CONFIG} ; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([--with-pg argument is a not an executable file. It should
be the path to the pg_config script, often somewhere like
/usr/local/pgsql/bin/pg_config.])
- fi
-
- AC_MSG_RESULT([yes])

- AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,-L`$PG_CONFIG --libdir`)
+ PKG_PROG_PKG_CONFIG([0.21])
+ PKG_CHECK_MODULES([PQ],[libpq > 9.1], [HAVE_PG=yes], [HAVE_PG=no])

if test "${HAVE_PG}" = "yes" ; then
- LIBS=-L`$PG_CONFIG --libdir`" -lpq $LIBS"
- PG_INC=-I`$PG_CONFIG --includedir`" -I"`$PG_CONFIG --includedir-server`
+ PG_LIB="${PQ_LIBS}"
+ PG_INC="${PQ_CFLAGS}"
+ SAVED_LIBS="${LIBS}"
+ LIBS="${PG_LIBS}"
+ AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no)
+ LIBS="${SAVED_LIBS}"
+ if test "${HAVE_PG}" = "yes" ; then
+ LIBS="${PG_LIB} ${LIBS}"
+ fi
+ else
+ if "x$with_pg" = "xyes"; then
+ AC_MSG_ERROR([--with-pg was requested, but libpq is not available])
+ fi
fi

fi
@@ -1293,6 +1292,7 @@ AC_SUBST(HAVE_PG,$HAVE_PG)
AC_SUBST(PG_INC,$PG_INC)
AC_SUBST(PG_LIB,$PG_LIB)

+
dnl ---------------------------------------------------------------------------
dnl Check if we should build with GRASS support.
dnl ---------------------------------------------------------------------------

< Previous Next >
This Thread