From 363be0bff62d343aa9bb913eeecaaff5baa85651 Mon Sep 17 00:00:00 2001 From: Devrim Gündüz Date: Feb 17 2020 05:32:03 +0000 Subject: postgis: Update patch for 3.0 --- diff --git a/postgis-2.4.0-install-desktop.patch b/postgis-2.4.0-install-desktop.patch deleted file mode 100644 index 5bb2a2b..0000000 --- a/postgis-2.4.0-install-desktop.patch +++ /dev/null @@ -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 diff --git a/postgis-3.0-install-desktop.patch b/postgis-3.0-install-desktop.patch new file mode 100644 index 0000000..00db865 --- /dev/null +++ b/postgis-3.0-install-desktop.patch @@ -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 diff --git a/postgis.spec b/postgis.spec index f9cdec2..40cd463 100644 --- a/postgis.spec +++ b/postgis.spec @@ -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} .