Replace complicated geotiff patch with CPPFLAGS=

Replace complicated geotiff patch (including autoconf run)
with setting CPPFLAGS= at configure time.

2 files changed, 4 insertions, 64 deletions

diff --git a/libgaiagraphics.spec b/libgaiagraphics.spec
index 3974f94..efcd702 100644
--- a/libgaiagraphics.spec
+++ b/libgaiagraphics.spec
@@ -7,15 +7,15 @@ Group:          System Environment/Libraries
 License:        GPLv3+
 URL:            http://www.gaia-gis.it/spatialite-2.4.0-4
 Source0:        http://www.gaia-gis.it/spatialite-2.4.0-4/libgaiagraphics-0.4.tar.gz
-Patch0:         libgaiagraphics_libgeotiff.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeotiff-devel 
 BuildRequires:  libjpeg-devel libpng-devel
 BuildRequires:  zlib-devel
 BuildRequires:  proj-devel
 BuildRequires:  cairo-devel
-BuildRequires:  autoconf
+# The source tarball explicitly mentions >= 1.2.5
+BuildRequires:  libgeotiff-devel >= 1.2.5
+BuildRequires:  pkgconfig
 
 %description
 Libgaigraphics wraps raster- and vector graphics, to implement a reasonably
@@ -34,21 +34,13 @@ developing applications that use %{name}.
 %prep
 %setup -q
 
-#TODO: Warning autoconf
-
-# Our libgeotiff ships with pkgconfig. configure.ac and Makefile.ini
-# are patched, hence the need to run autoconf.
-# Since that is not standard, informing upstream is not useful
-%patch0 -p1 -b .libgeotiff
 
 %build
-autoconf
-%configure --disable-static
+%configure --disable-static CPPFLAGS="$(pkg-config --cflags libgeotiff)"
 
 # Remove links to unused libraries
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-
 make %{?_smp_mflags}
 
 
diff --git a/libgaiagraphics_libgeotiff.patch b/libgaiagraphics_libgeotiff.patch
deleted file mode 100644
index 63737b0..0000000
--- a/libgaiagraphics_libgeotiff.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- libgaiagraphics-0.4/configure.ac	2010-11-12 15:08:31.000000000 +0100
-+++ libgaiagraphics-0.4_libgeotiff/configure.ac	2010-12-26 02:02:10.651546399 +0100
-@@ -23,11 +23,11 @@
- AC_CHECK_HEADERS(unistd.h,, [AC_MSG_ERROR([cannot find unistd.h, bailing out])])
- AC_CHECK_HEADERS(jpeglib.h,, [AC_MSG_ERROR([cannot find jpeglib.h, bailing out])])
- AC_CHECK_HEADERS(jerror.h,, [AC_MSG_ERROR([cannot find jerror.h, bailing out])])
--AC_CHECK_HEADERS(geotiff.h,, [AC_MSG_ERROR([cannot find geotiff.h, bailing out])])
--AC_CHECK_HEADERS(xtiffio.h,, [AC_MSG_ERROR([cannot find xtiffio.h, bailing out])])
--AC_CHECK_HEADERS(geo_tiffp.h,, [AC_MSG_ERROR([cannot find geo_tiffp.h, bailing out])])
--AC_CHECK_HEADERS(geovalues.h,, [AC_MSG_ERROR([cannot find geovalues.h, bailing out])])
--AC_CHECK_HEADERS(geo_normalize.h,, [AC_MSG_ERROR([cannot find geo_normalize.h, bailing out])])
-+AC_CHECK_HEADERS(libgeotiff/geotiff.h,, [AC_MSG_ERROR([cannot find geotiff.h, bailing out])])
-+AC_CHECK_HEADERS(libgeotiff/xtiffio.h,, [AC_MSG_ERROR([cannot find xtiffio.h, bailing out])])
-+AC_CHECK_HEADERS(libgeotiff/geo_tiffp.h,, [AC_MSG_ERROR([cannot find geo_tiffp.h, bailing out])])
-+AC_CHECK_HEADERS(libgeotiff/geovalues.h,, [AC_MSG_ERROR([cannot find geovalues.h, bailing out])])
-+AC_CHECK_HEADERS(libgeotiff/geo_normalize.h,, [AC_MSG_ERROR([cannot find geo_normalize.h, bailing out])])
- 
- # Checks for programs.
- AC_PROG_CXX
-@@ -70,6 +70,10 @@
- AC_SUBST(LIBCAIRO_CFLAGS)
- AC_SUBST(LIBCAIRO_LIBS)
- 
-+PKG_CHECK_MODULES([LIBGEOTIFF], [libgeotiff], , AC_MSG_ERROR(['libgeotiff' is required but it doesn't seems to be installed on this system.]))
-+AC_SUBST(LIBGEOTIFF_CFLAGS)
-+AC_SUBST(LIBGEOTIFF_LIBS)
-+
- AC_CONFIG_FILES([Makefile \
- 		headers/Makefile \
- 		src/Makefile \
---- libgaiagraphics-0.4/Makefile.in	2010-11-12 15:12:54.000000000 +0100
-+++ libgaiagraphics-0.4_libgeotiff/Makefile.in	2010-12-26 02:10:30.014563710 +0100
-@@ -121,6 +121,8 @@
- LIBOBJS = @LIBOBJS@
- LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
- LIBPNG_LIBS = @LIBPNG_LIBS@
-+LIBGEOTIFF_CFLAGS = @LIBGEOTIFF_CFLAGS@
-+LIBGEOTIFF_LIBS = @LIBGEOTIFF_LIBS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
---- libgaiagraphics-0.4/src/Makefile.in	2010-11-12 15:12:54.000000000 +0100
-+++ libgaiagraphics-0.4_nochnichtok/src/Makefile.in	2010-12-26 03:38:53.007688314 +0100
-@@ -195,7 +195,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 \
--	@LIBPNG_CFLAGS@ @LIBCAIRO_CFLAGS@
-+	@LIBPNG_CFLAGS@ @LIBCAIRO_CFLAGS@ @LIBGEOTIFF_CFLAGS@
- 
- INCLUDES = @CFLAGS@ -I$(top_srcdir)/headers
- lib_LTLIBRARIES = libgaiagraphics.la