postgis: Update patch for 3.0

This commit is contained in:
Devrim Gündüz 2020-02-17 08:32:03 +03:00
parent 3ca4586dec
commit 363be0bff6
3 changed files with 12 additions and 18 deletions

View File

@ -1,15 +0,0 @@
diff --git a/loader/Makefile.in b/loader/Makefile.in
index cb8df63..0ab2670 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -130,7 +130,9 @@ ifdef gtk_build
done
endif
-install: installdir install-desktop install-icons
+install-rpm-desktop: install-desktop install-icons
+
+install: installdir
ifdef gtk_build
$(LIBTOOL) --mode=install $(INSTALL) $(SHP2PGSQL-GUI) "$(DESTDIR)$(bindir)/$(SHP2PGSQL-GUI)"
endif

View File

@ -0,0 +1,11 @@
--- loader/Makefile.in.old 2020-02-17 08:30:11.089252849 +0300
+++ loader/Makefile.in 2020-02-17 08:30:27.584353449 +0300
@@ -132,6 +132,8 @@
endif
install: installdir install-desktop install-icons
+install-rpm-desktop: install-desktop install-icons
+
ifdef gtk_build
$(LIBTOOL) --mode=install $(INSTALL) $(SHP2PGSQL-GUI) "$(DESTDIR)$(bindir)/$(SHP2PGSQL-GUI)"
endif

View File

@ -34,8 +34,7 @@ Source0: http://download.osgeo.org/%{name}/source/%{name}-%{version}.tar.gz
Source2: http://download.osgeo.org/%{name}/docs/%{name}-%{version}.pdf
Source3: http://download.osgeo.org/%{name}/source/%{name}-%{prevversion}.tar.gz
Source4: filter-requires-perl-Pg.sh
Patch3: postgis-2.4.0-install-desktop.patch
Patch4: postgis-2.4.0-code-check-only.patch
Patch3: postgis-%{majorversion}-install-desktop.patch
URL: http://www.postgis.net
BuildRequires: perl-generators
@ -131,7 +130,6 @@ cd %{name}-%{prevversion}
)
%endif
%patch3 -p1
%patch4 -p1
cp -p %{SOURCE2} .