commit 04824fa6d41a925e6696ff0a23cd0db424704683
Author: Jan Rękorajski <[email protected]>
Date: Sun Nov 3 22:51:03 2019 +0100
- fix liblwgeom-devel packaging
- rel 2
install-lwgeom.patch | 3 ++-
postgis.spec | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/postgis.spec b/postgis.spec
index 3292dd5..3926f09 100644
--- a/postgis.spec
+++ b/postgis.spec
@@ -11,7 +11,7 @@ Summary(pl.UTF-8): Rozszerzenie do PostgreSQL wspomagające
Geograficzne Systemy
Name: postgis
Version: 3.0.0
%define subver %{nil}
-Release: 1
+Release: 2
License: GPL v2+
Group: Applications/Databases
Source0:
https://download.osgeo.org/postgis/source/%{name}-%{version}%{subver}.tar.gz
@@ -133,6 +133,10 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+cp -p postgis_config.h $RPM_BUILD_ROOT%{_includedir}
+
+%{__sed} -i -e 's/#include.*postgis_config.*/#include "postgis_config.h"/'
$RPM_BUILD_ROOT%{_includedir}/liblwgeom.h
+
# Fix icons and desktop file locations
%{__mv} $RPM_BUILD_ROOT%{_datadir}/{postgresql,}/icons
%{__mv} $RPM_BUILD_ROOT%{_datadir}/{postgresql,}/applications
@@ -195,6 +199,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/liblwgeom.la
%{_includedir}/liblwgeom.h
%{_includedir}/liblwgeom_topo.h
+%{_includedir}/lwinline.h
+%{_includedir}/postgis_config.h
%files -n liblwgeom-static
%defattr(644,root,root,755)
diff --git a/install-lwgeom.patch b/install-lwgeom.patch
index 7e33192..96d791d 100644
--- a/install-lwgeom.patch
+++ b/install-lwgeom.patch
@@ -1,6 +1,6 @@
--- postgis-3.0.0/liblwgeom/Makefile.in~ 2019-10-20 04:26:04.000000000
+0200
+++ postgis-3.0.0/liblwgeom/Makefile.in 2019-11-03 16:54:16.676165887
+0100
-@@ -163,7 +163,14 @@
+@@ -163,7 +163,15 @@
all: liblwgeom.la
@@ -13,6 +13,7 @@
+ $(INSTALL) -d "$(DESTDIR)$(includedir)"
+ $(INSTALL) -m 0644 liblwgeom.h "$(DESTDIR)$(includedir)/liblwgeom.h"
+ $(INSTALL) -m 0644 liblwgeom_topo.h
"$(DESTDIR)$(includedir)/liblwgeom_topo.h"
++ $(INSTALL) -m 0644 lwinline.h "$(DESTDIR)$(includedir)/lwinline.h"
uninstall:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/postgis.git/commitdiff/04824fa6d41a925e6696ff0a23cd0db424704683
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
