From 07bf6f39ace34781b787c07fe5afd0a3a741ac93 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 19 Jul 2015 07:13:53 +0000 Subject: [PATCH] - don't redefine target_platform - fix configure.in - rel 3 --- grass-ac.patch | 13 +++++++++++++ grass.spec | 3 +-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/grass-ac.patch b/grass-ac.patch index a1c9699..a429871 100644 --- a/grass-ac.patch +++ b/grass-ac.patch @@ -214,3 +214,16 @@ $(OBJDIR)/confparms.h: $(MODULE_TOPDIR)/config.status - sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@ + sed -n '7s/^#\(.*\)$$/"\1"/p;s/^ac_cs_config="\(.*"\)$$/".\/configure \1/p' $< > $@ +--- grass-6.4.4/configure.in~ 2015-07-19 06:50:37.000000000 +0000 ++++ grass-6.4.4/configure.in 2015-07-19 06:51:21.133489471 +0000 +@@ -101,10 +101,6 @@ + + AC_SUBST(ARCH) + +-# Use absolute path for aux directory so that install-sh works +- +-AC_CONFIG_AUX_DIR($SRCDIR) +- + # Set GISBASE and GRASS_BIN + + GISBASE="${WINDSTDIR}/dist.${ARCH}" diff --git a/grass.spec b/grass.spec index 65a3863..f49a7d3 100644 --- a/grass.spec +++ b/grass.spec @@ -14,7 +14,7 @@ Summary: The Geographic Resources Analysis Support System Summary(pl.UTF-8): System obsługujący analizę zasobów geograficznych Name: grass Version: 6.4.4 -Release: 2 +Release: 3 Epoch: 1 License: GPL v2+ Group: X11/Applications @@ -78,7 +78,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define gver %{version} %define _noautoreqdep libGL.so.1 libGLU.so.1 %define _sysconfdir /etc/X11 -%define _target_platform %(echo %{_target_cpu}-%{_target_vendor}-%{_host_os} | sed -e 's/athlon/i686/;s/ppc/powerpc/;s/amd64/x86_64/') %description GRASS (the Geographic Resources Analysis Support System) is a software -- 2.44.0