From 2c28d9dc98c3b617da165294ab1e36c37740be867c3e36c24a19492c576e7a18 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 4 Feb 2016 20:02:29 +0000 Subject: [PATCH] Accepting request 357779 from home:behrisch:branches:Application:Geo fixes PACKAGE_NAME redefinition warnings for all packages using gdal/port/cpl_config.h (included by gdal_priv.h). OBS-URL: https://build.opensuse.org/request/show/357779 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=25 --- gdal.changes | 5 +++++ gdal.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/gdal.changes b/gdal.changes index 53cd1ff..7e6122c 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 4 18:55:25 UTC 2016 - behrisch@users.sourceforge.net + +- Fixing PACKAGE_* redefines in cpl_config.h + ------------------------------------------------------------------- Sun Jan 31 16:55:00 UTC 2016 - Angelos Tzotsos diff --git a/gdal.spec b/gdal.spec index b1fe73e..ecad90a 100644 --- a/gdal.spec +++ b/gdal.spec @@ -284,6 +284,9 @@ rm -rf %{buildroot}%{perl_vendorarch}/auto/Geo/*/.packlist rm -rf %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/.packlist rm -rf %{buildroot}%{_bindir}/*.dox +# avoid PACKAGE redefines +sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_config.h + %post -n lib%{name}1 -p /sbin/ldconfig %postun -n lib%{name}1 -p /sbin/ldconfig