[packages/grass] - up to 7.6.1
baggins
baggins at pld-linux.org
Sun Apr 7 13:25:31 CEST 2019
commit e40933fea497e48b107588af5ccb00e6a29632c6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Apr 7 13:25:19 2019 +0200
- up to 7.6.1
grass-ac.patch | 158 ---------------------------------------
grass.spec | 229 ++++++++++++++++++++++++++++-----------------------------
2 files changed, 114 insertions(+), 273 deletions(-)
---
diff --git a/grass.spec b/grass.spec
index ab32b3e..883f6c9 100644
--- a/grass.spec
+++ b/grass.spec
@@ -9,15 +9,15 @@
Summary: The Geographic Resources Analysis Support System
Summary(pl.UTF-8): System obsługujący analizę zasobów geograficznych
Name: grass
-Version: 7.4.0
-Release: 5
+Version: 7.6.1
+%define gver %(echo %{version} | awk -F. '{ print $1$2 }')
+Release: 1
Epoch: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://grass.osgeo.org/grass74/source/%{name}-%{version}.tar.gz
-# Source0-md5: 15b9eb019d6c132c1a65455b3283cf69
+Source0: http://grass.osgeo.org/grass%{gver}/source/%{name}-%{version}.tar.gz
+# Source0-md5: 9ca74f9010d013f735737a90c65d8a7f
Patch0: %{name}-soname.patch
-Patch1: %{name}-ac.patch
Patch3: %{name}-ctypesgen.patch
URL: http://grass.osgeo.org/
BuildRequires: OpenGL-GLU-devel
@@ -62,7 +62,6 @@ BuildRequires: zlib-devel
Requires: proj >= 4.4.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define gver %{version}
%define _noautoreqdep libGL.so.1 libGLU.so.1
%define _sysconfdir /etc/X11
@@ -146,7 +145,6 @@ Pliki nagłówkowe i biblioteki statyczne systemu GRASS.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch3 -p1
%{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
@@ -157,10 +155,9 @@ Pliki nagłówkowe i biblioteki statyczne systemu GRASS.
find general gui imagery lib/python/pygrass lib/init raster scripts temporal tools -name '*.py' | xargs grep -l '/usr/bin/env python' | xargs %{__sed} -i -e '1s,/usr/bin/env python,%{__python},'
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%configure \
+#export CFLAGS="%{rpmcflags} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
+#export CXXFLAGS="%{rpmcxxflags} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
+%configure2_13 \
%if "%{_lib}" == "lib64"
--enable-64bit \
%endif
@@ -193,15 +190,14 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
prefix=$RPM_BUILD_ROOT%{_libdir} \
- BINDIR=$RPM_BUILD_ROOT%{_bindir} \
- PREFIX=$RPM_BUILD_ROOT%{_libdir}
+ UNIX_BIN=$RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT{%{_datadir},%{_includedir}/grass74}
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass-%{gver}/include/* $RPM_BUILD_ROOT%{_includedir}/grass74
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass-%{gver}/lib/* $RPM_BUILD_ROOT%{_libdir}
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass-%{gver}/locale $RPM_BUILD_ROOT%{_datadir}
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass-%{gver}/docs/man $RPM_BUILD_ROOT%{_datadir}
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass-%{gver}/share/{appdata,applications,icons} $RPM_BUILD_ROOT%{_datadir}
+install -d $RPM_BUILD_ROOT{%{_datadir},%{_includedir}/grass%{gver}}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass%{gver}/include/* $RPM_BUILD_ROOT%{_includedir}/grass%{gver}/
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass%{gver}/lib/* $RPM_BUILD_ROOT%{_libdir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass%{gver}/locale $RPM_BUILD_ROOT%{_datadir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass%{gver}/docs/man $RPM_BUILD_ROOT%{_datadir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/grass%{gver}/share/{metainfo,applications,icons} $RPM_BUILD_ROOT%{_datadir}
# these manual cover topics, not programs, so shouldn't exist in section 1
# (maybe in section 7, but names are too common anyway); keep HTML version only
@@ -210,16 +206,20 @@ install -d $RPM_BUILD_ROOT{%{_datadir},%{_includedir}/grass74}
# non-standard icons
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/40x40
-%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/grass-%{gver}/docs
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/grass%{gver}/docs
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{id_ID,id}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/zh_CN
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{zh,zh_CN}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/AUTHORS
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/CHANGES
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/COPYING
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/GPL.TXT
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/REQUIREMENTS.html
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}%{gver}/{AUTHORS,CHANGES,CITING,COPYING,GPL.TXT,INSTALL,REQUIREMENTS.html}
+
+%{__sed} -i -e "s|$RPM_BUILD_ROOT||g" \
+ $RPM_BUILD_ROOT%{_libdir}/grass%{gver}/etc/fontcap \
+ $RPM_BUILD_ROOT%{_libdir}/grass%{gver}/demolocation/.grassrc%{gver} \
+ $RPM_BUILD_ROOT%{_bindir}/grass%{gver} \
+ $RPM_BUILD_ROOT%{_includedir}/grass%{gver}/Make/Grass.make \
+ $RPM_BUILD_ROOT%{_includedir}/grass%{gver}/Make/Platform.make
%find_lang %{name} --all-name
@@ -231,96 +231,95 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS CHANGES COPYING README TODO
-#%attr(755,root,root) %{_bindir}/grass74
-%attr(755,root,root) %{_libdir}/libgrass_*.%{version}.so
-%dir %{_libdir}/grass-%{gver}
-%dir %{_libdir}/grass-%{gver}/*.csv
-%attr(755,root,root) %{_libdir}/grass-%{gver}/config.status
-%attr(755,root,root) %{_libdir}/grass-%{gver}/bin
-%attr(755,root,root) %{_libdir}/grass-%{gver}/driver
-%dir %{_libdir}/grass-%{gver}/etc
-%{_libdir}/grass-%{gver}/etc/VERSIONNUMBER
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/clean_temp
-%{_libdir}/grass-%{gver}/etc/colors
-%{_libdir}/grass-%{gver}/etc/colors.desc
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/current_time_s_ms
-%{_libdir}/grass-%{gver}/etc/d.mon
-%{_libdir}/grass-%{gver}/etc/d.polar
-%{_libdir}/grass-%{gver}/etc/db.test
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/echo
-%{_libdir}/grass-%{gver}/etc/element_list
-%{_libdir}/grass-%{gver}/etc/fontcap
-%{_libdir}/grass-%{gver}/etc/grass74.py
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/i.find
-%{_libdir}/grass-%{gver}/etc/license
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/lister
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/lock
-%{_libdir}/grass-%{gver}/etc/paint
-%{_libdir}/grass-%{gver}/etc/proj
-%{_libdir}/grass-%{gver}/etc/psdriver.ps
-%{_libdir}/grass-%{gver}/etc/python
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/r.in.wms
-%dir %{_libdir}/grass-%{gver}/etc/r.watershed
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/r.watershed/ram
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/r.watershed/seg
-%{_libdir}/grass-%{gver}/etc/renamed_options
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/run
-%{_libdir}/grass-%{gver}/etc/sql
-%{_libdir}/grass-%{gver}/etc/symbol
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/wxpyimgview_gui.py
-%{_libdir}/grass-%{gver}/fonts
-%dir %{_libdir}/grass-%{gver}/gui
-%{_libdir}/grass-%{gver}/gui/icons
-%{_libdir}/grass-%{gver}/gui/images
-%dir %{_libdir}/grass-%{gver}/gui/scripts
-%attr(755,root,root) %{_libdir}/grass-%{gver}/gui/scripts/d.*
-%dir %{_libdir}/grass-%{gver}/gui/wxpython
-%{_libdir}/grass-%{gver}/gui/wxpython/README
-%{_libdir}/grass-%{gver}/gui/wxpython/animation
-%{_libdir}/grass-%{gver}/gui/wxpython/core
-%{_libdir}/grass-%{gver}/gui/wxpython/datacatalog
-%{_libdir}/grass-%{gver}/gui/wxpython/dbmgr
-%{_libdir}/grass-%{gver}/gui/wxpython/gcp
-%{_libdir}/grass-%{gver}/gui/wxpython/gmodeler
-%{_libdir}/grass-%{gver}/gui/wxpython/gui_core
-%{_libdir}/grass-%{gver}/gui/wxpython/iclass
-%{_libdir}/grass-%{gver}/gui/wxpython/icons
-%{_libdir}/grass-%{gver}/gui/wxpython/image2target
-%{_libdir}/grass-%{gver}/gui/wxpython/iscatt
-%{_libdir}/grass-%{gver}/gui/wxpython/lmgr
-%{_libdir}/grass-%{gver}/gui/wxpython/location_wizard
-%{_libdir}/grass-%{gver}/gui/wxpython/mapdisp
-%{_libdir}/grass-%{gver}/gui/wxpython/mapswipe
-%{_libdir}/grass-%{gver}/gui/wxpython/mapwin
-%{_libdir}/grass-%{gver}/gui/wxpython/modules
-%{_libdir}/grass-%{gver}/gui/wxpython/nviz
-%{_libdir}/grass-%{gver}/gui/wxpython/photo2image
-%{_libdir}/grass-%{gver}/gui/wxpython/psmap
-%{_libdir}/grass-%{gver}/gui/wxpython/rdigit
-%{_libdir}/grass-%{gver}/gui/wxpython/rlisetup
-%{_libdir}/grass-%{gver}/gui/wxpython/startup
-%{_libdir}/grass-%{gver}/gui/wxpython/timeline
-%{_libdir}/grass-%{gver}/gui/wxpython/tplot
-%{_libdir}/grass-%{gver}/gui/wxpython/vdigit
-%{_libdir}/grass-%{gver}/gui/wxpython/vnet
-%{_libdir}/grass-%{gver}/gui/wxpython/web_services
-%{_libdir}/grass-%{gver}/gui/wxpython/wxplot
-%{_libdir}/grass-%{gver}/gui/wxpython/xml
-%{_libdir}/grass-%{gver}/gui/wxpython/gis_set*.py*
-%{_libdir}/grass-%{gver}/gui/wxpython/wxgui.py*
-%{_libdir}/grass-%{gver}/gui/xml
-%attr(755,root,root) %{_libdir}/grass-%{gver}/scripts
-%dir %{_libdir}/grass-%{gver}/tools
-%attr(755,root,root) %{_libdir}/grass-%{gver}/tools/g.echo
-%attr(755,root,root) %{_libdir}/grass-%{gver}/tools/g.html2man.py
-%{_libdir}/grass-%{gver}/tools/ggroff.py*
-%{_libdir}/grass-%{gver}/tools/ghtml.py*
-%attr(755,root,root) %{_libdir}/grass-%{gver}/tools/mkhtml.py
-%{_libdir}/grass-%{gver}/translation_status.json
+%doc AUTHORS CHANGES CITING COPYING README TODO
+#%attr(755,root,root) %{_bindir}/grass%{gver}
+%attr(755,root,root) %{_libdir}/libgrass_*.*.*.so
+%dir %{_libdir}/grass%{gver}
+%dir %{_libdir}/grass%{gver}/*.csv
+%attr(755,root,root) %{_libdir}/grass%{gver}/config.status
+%attr(755,root,root) %{_libdir}/grass%{gver}/bin
+%attr(755,root,root) %{_libdir}/grass%{gver}/driver
+%dir %{_libdir}/grass%{gver}/etc
+%{_libdir}/grass%{gver}/etc/VERSIONNUMBER
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/clean_temp
+%{_libdir}/grass%{gver}/etc/colors
+%{_libdir}/grass%{gver}/etc/colors.desc
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/current_time_s_ms
+%{_libdir}/grass%{gver}/etc/d.mon
+%{_libdir}/grass%{gver}/etc/d.polar
+%{_libdir}/grass%{gver}/etc/db.test
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/echo
+%{_libdir}/grass%{gver}/etc/element_list
+%{_libdir}/grass%{gver}/etc/fontcap
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/i.find
+%{_libdir}/grass%{gver}/etc/license
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/lister
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/lock
+%{_libdir}/grass%{gver}/etc/paint
+%{_libdir}/grass%{gver}/etc/proj
+%{_libdir}/grass%{gver}/etc/psdriver.ps
+%{_libdir}/grass%{gver}/etc/python
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/r.in.wms
+%dir %{_libdir}/grass%{gver}/etc/r.watershed
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/r.watershed/ram
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/r.watershed/seg
+%{_libdir}/grass%{gver}/etc/renamed_options
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/run
+%{_libdir}/grass%{gver}/etc/sql
+%{_libdir}/grass%{gver}/etc/symbol
+%attr(755,root,root) %{_libdir}/grass%{gver}/etc/wxpyimgview_gui.py
+%{_libdir}/grass%{gver}/fonts
+%dir %{_libdir}/grass%{gver}/gui
+%{_libdir}/grass%{gver}/gui/icons
+%{_libdir}/grass%{gver}/gui/images
+%dir %{_libdir}/grass%{gver}/gui/scripts
+%attr(755,root,root) %{_libdir}/grass%{gver}/gui/scripts/d.*
+%dir %{_libdir}/grass%{gver}/gui/wxpython
+%{_libdir}/grass%{gver}/gui/wxpython/README
+%{_libdir}/grass%{gver}/gui/wxpython/animation
+%{_libdir}/grass%{gver}/gui/wxpython/core
+%{_libdir}/grass%{gver}/gui/wxpython/datacatalog
+%{_libdir}/grass%{gver}/gui/wxpython/dbmgr
+%{_libdir}/grass%{gver}/gui/wxpython/gcp
+%{_libdir}/grass%{gver}/gui/wxpython/gmodeler
+%{_libdir}/grass%{gver}/gui/wxpython/gui_core
+%{_libdir}/grass%{gver}/gui/wxpython/iclass
+%{_libdir}/grass%{gver}/gui/wxpython/icons
+%{_libdir}/grass%{gver}/gui/wxpython/image2target
+%{_libdir}/grass%{gver}/gui/wxpython/iscatt
+%{_libdir}/grass%{gver}/gui/wxpython/lmgr
+%{_libdir}/grass%{gver}/gui/wxpython/location_wizard
+%{_libdir}/grass%{gver}/gui/wxpython/mapdisp
+%{_libdir}/grass%{gver}/gui/wxpython/mapswipe
+%{_libdir}/grass%{gver}/gui/wxpython/mapwin
+%{_libdir}/grass%{gver}/gui/wxpython/modules
+%{_libdir}/grass%{gver}/gui/wxpython/nviz
+%{_libdir}/grass%{gver}/gui/wxpython/photo2image
+%{_libdir}/grass%{gver}/gui/wxpython/psmap
+%{_libdir}/grass%{gver}/gui/wxpython/rdigit
+%{_libdir}/grass%{gver}/gui/wxpython/rlisetup
+%{_libdir}/grass%{gver}/gui/wxpython/startup
+%{_libdir}/grass%{gver}/gui/wxpython/timeline
+%{_libdir}/grass%{gver}/gui/wxpython/tplot
+%{_libdir}/grass%{gver}/gui/wxpython/vdigit
+%{_libdir}/grass%{gver}/gui/wxpython/vnet
+%{_libdir}/grass%{gver}/gui/wxpython/web_services
+%{_libdir}/grass%{gver}/gui/wxpython/wxplot
+%{_libdir}/grass%{gver}/gui/wxpython/xml
+%{_libdir}/grass%{gver}/gui/wxpython/gis_set*.py*
+%{_libdir}/grass%{gver}/gui/wxpython/wxgui.py*
+%{_libdir}/grass%{gver}/gui/xml
+%attr(755,root,root) %{_libdir}/grass%{gver}/scripts
+%dir %{_libdir}/grass%{gver}/tools
+%attr(755,root,root) %{_libdir}/grass%{gver}/tools/g.echo
+%attr(755,root,root) %{_libdir}/grass%{gver}/tools/g.html2man.py
+%{_libdir}/grass%{gver}/tools/ggroff.py*
+%{_libdir}/grass%{gver}/tools/ghtml.py*
+%attr(755,root,root) %{_libdir}/grass%{gver}/tools/mkhtml.py
+%{_libdir}/grass%{gver}/translation_status.json
# default (demo?) database - subpackage?
-%{_libdir}/grass-%{gver}/demolocation
-%{_datadir}/appdata/grass.appdata.xml
+%{_libdir}/grass%{gver}/demolocation
+%{_datadir}/metainfo/org.osgeo.grass.appdata.xml
%{_desktopdir}/grass.desktop
%{_iconsdir}/hicolor/*x*/apps/grass.png
%{_iconsdir}/hicolor/scalable/apps/grass.svg
@@ -354,4 +353,4 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libgrass_btree2.so
%attr(755,root,root) %{_libdir}/libgrass_dig2.so
%{_libdir}/libgrass_iostream.%{version}.a
-%{_includedir}/grass74
+%{_includedir}/grass%{gver}
diff --git a/grass-ac.patch b/grass-ac.patch
deleted file mode 100644
index dab9e48..0000000
--- a/grass-ac.patch
+++ /dev/null
@@ -1,158 +0,0 @@
---- grass-7.0.3/lib/gis/Makefile.orig 2016-04-03 19:35:16.596262959 +0200
-+++ grass-7.0.3/lib/gis/Makefile 2016-04-03 21:12:20.269351895 +0200
-@@ -22,7 +22,7 @@
-
- default: lib $(FMODE_OBJ) $(PROJFILES) $(COLORFILES) $(ETC)/colors.desc $(ETC)/renamed_options
-
--ifdef MINGW
-+ifeq ($(MINGW),yes)
- $(FMODE_OBJ): $(OBJDIR)/fmode.o
- $(INSTALL) $< $@
- endif
---- grass-6.4.2/lib/init/Makefile.orig 2011-06-08 12:30:46.000000000 +0200
-+++ grass-6.4.2/lib/init/Makefile 2012-10-20 14:33:08.316948107 +0200
-@@ -60,7 +60,7 @@
- $(ETC)/html_browser_mac.sh
- endif
-
--ifneq ($(strip $(MINGW)),)
-+ifeq ($(strip $(MINGW)),yes)
- FILES += \
- $(ETC)/Init.bat \
- $(ETC)/winlocale$(EXE) \
---- grass-7.0.3/lib/python/ctypes/Makefile.orig 2016-04-03 19:35:16.626262959 +0200
-+++ grass-7.0.3/lib/python/ctypes/Makefile 2016-04-03 21:13:18.706016110 +0200
-@@ -58,7 +58,7 @@
- CTYPESFLAGS = --cpp "$(CC) -E $(CPPFLAGS) $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC) -D__GLIBC_HAVE_LONG_LONG"
- EXTRA_CLEAN_FILES := $(wildcard ctypesgencore/*.pyc) $(wildcard ctypesgencore/*/*.pyc)
-
--ifneq ($(MINGW),)
-+ifeq ($(MINGW),yes)
- INTLLIB = -lintl-8
- endif
-
---- grass-7.0.3/gui/scripts/Makefile.orig 2016-04-03 19:35:16.652929624 +0200
-+++ grass-7.0.3/gui/scripts/Makefile 2016-04-03 21:15:10.182678097 +0200
-@@ -6,7 +6,7 @@
-
- DSTDIR = $(GUIDIR)/scripts
-
--ifdef MINGW
-+ifeq ($(MINGW),yes)
- PYFILES := $(patsubst %.py, $(DSTDIR)/%_wrapper.py, $(filter %.py, $(PY_SOURCES)))
- BATFILES := $(patsubst %.py, $(DSTDIR)/%.bat, $(filter %.py, $(PY_SOURCES)))
- $(DSTDIR)/%_wrapper.py: %.py | $(DSTDIR)
---- grass-7.0.3/include/Make/Grass.make.orig 2014-11-03 10:57:12.000000000 +0100
-+++ grass-7.0.3/include/Make/Grass.make 2016-04-03 21:16:54.589340383 +0200
-@@ -80,7 +80,7 @@
- VECT_CFLAGS = $(GDALCFLAGS) $(GEOSCFLAGS)
-
- # Object with _fmode which must be linked to each executable on Windows
--ifdef MINGW
-+ifeq ($(MINGW),yes)
- WINDRES = windres
- FMODE_OBJ = $(BASE_LIBDIR)/fmode.o
- # if fmode.o causes trouble, try:
-@@ -235,7 +235,7 @@
-
- ifneq ($(GDAL_LINK),)
- ifneq ($(GDAL_DYNAMIC),)
--ifneq ($(MINGW),)
-+ifeq ($(MINGW),yes)
- RASTERDEPS += -lkernel32
- else
- RASTERDEPS += $(DLLIB)
-@@ -277,7 +277,7 @@
-
- $(foreach lib,$(libs),$(eval $(call lib_rules,$(firstword $(subst :, ,$(lib))),$(lastword $(subst :, ,$(lib))))))
-
--ifneq ($(MINGW),)
-+ifeq ($(MINGW),yes)
- GISLIB += $(INTLLIB)
- endif
-
---- grass-7.0.3/include/Make/Shlib.make.orig 2016-04-03 19:35:16.679596287 +0200
-+++ grass-7.0.3/include/Make/Shlib.make 2016-04-03 21:17:48.062671474 +0200
-@@ -8,7 +8,7 @@
-
- $(SHLIB): $(SHLIB_OBJS)
- $(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB)
--ifndef MINGW
-+ifneq ($(MINGW),yes)
- (cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
- endif
-
---- grass-7.0.3/include/Make/Script.make.orig 2016-04-03 19:35:16.679596287 +0200
-+++ grass-7.0.3/include/Make/Script.make 2016-04-03 21:18:54.369335354 +0200
-@@ -1,7 +1,7 @@
-
- include $(MODULE_TOPDIR)/include/Make/Vars.make
-
--ifdef MINGW
-+ifeq ($(MINGW),yes)
- SCRIPT = $(SCRIPTDIR)/$(PGM).py
- else
- SCRIPT = $(SCRIPTDIR)/$(PGM)
-@@ -18,7 +18,7 @@
- include $(MODULE_TOPDIR)/include/Make/ScriptRules.make
-
- SCRIPT_ACTIONS = $(SCRIPT) $(ETCPYFILES) $(ETCPYCFILES) html scriptstrings
--ifdef MINGW
-+ifeq ($(MINGW),yes)
- SCRIPT_ACTIONS += $(BIN)/$(PGM).bat
- SCRIPT_DIR = %GISBASE%/scripts
- endif
---- grass-6.4.3/include/Make/Rules.make.orig 2013-03-02 11:52:07.000000000 +0100
-+++ grass-6.4.3/include/Make/Rules.make 2014-06-11 21:22:16.080021691 +0200
-@@ -66,7 +66,7 @@
- %.tab.h %.tab.c: %.y
- $(YACC) -b$* -p$* $(YACCFLAGS) $<
-
--ifneq ($(MINGW),)
-+ifeq ($(MINGW),yes)
- mkpath = $(shell $(TOOLSDIR)/g.echo$(EXE) $(1));$(2)
- else
- mkpath = $(1):$(2)
---- grass-7.0.3/include/Make/GuiScript.make.orig 2014-12-17 14:10:44.000000000 +0100
-+++ grass-7.0.3/include/Make/GuiScript.make 2016-04-03 21:20:29.075998049 +0200
-@@ -10,7 +10,7 @@
- MODULES := $(patsubst g.gui.%.py,%,$(wildcard g.gui.*.py))
- CMDHTML := $(patsubst %,$(HTMLDIR)/g.gui.%.html,$(MODULES))
- GUIHTML := $(patsubst %,$(HTMLDIR)/wxGUI.%.html,$(MODULES))
--ifdef MINGW
-+ifeq ($(MINGW),yes)
- SCRIPTEXT = .py
- BATFILES := $(patsubst %,$(BIN)/g.gui.%.bat,$(MODULES))
- else
---- grass-7.0.3/lib/proj/Makefile.orig 2015-12-17 09:13:35.000000000 +0100
-+++ grass-7.0.3/lib/proj/Makefile 2016-04-03 21:20:54.752663637 +0200
-@@ -36,7 +36,7 @@
- default: lib $(FTOL_OBJ)
- $(MAKE) $(NAD_DSTFILES) $(CSV_DSTFILES) $(PROJ_DSTFILES) $(NAD_SRCFILES)
-
--ifdef MINGW
-+ifeq ($(MINGW),yes)
- $(FTOL_OBJ): $(OBJDIR)/ftol.o
- $(INSTALL) $< $@
- endif
---- grass-7.0.3/configure.in~ 2015-07-19 06:50:37.000000000 +0000
-+++ grass-7.0.3/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}"
---- grass-7.0.3/include/Makefile.orig 2011-11-14 09:26:04.000000000 +0100
-+++ grass-7.0.3/include/Makefile 2016-04-03 17:16:49.983278219 +0200
-@@ -46,4 +46,4 @@
- sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
-
- $(ARCH_INCDIR)/confparms.h: $(MODULE_TOPDIR)/config.status | $(ARCH_INCDIR)
-- sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@
-+ sed -n '7s/^#\(.*\)$$/"\1"/p;s/^ac_cs_config="\(.*"\)$$/".\/configure \1/p' $< > $@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grass.git/commitdiff/e40933fea497e48b107588af5ccb00e6a29632c6
More information about the pld-cvs-commit
mailing list