commit 44ac6d31d4225f81a79aa379fa7dc5e34ea7e6bf
Author: Adam Gołębiowski <[email protected]>
Date: Tue Dec 11 15:06:23 2018 +0100
- updated to 1.4.2 (new soname), BR: ac,am,lt,proj-devel
shapelib-make.patch | 91 -----------------------------------------------------
shapelib.spec | 47 ++++++++++++---------------
2 files changed, 20 insertions(+), 118 deletions(-)
---
diff --git a/shapelib.spec b/shapelib.spec
index f098a22..0faa018 100644
--- a/shapelib.spec
+++ b/shapelib.spec
@@ -1,21 +1,19 @@
-# TODO
-# - fix build CC containing spaces, like ccache cc
Summary: Shapefile C Library
Summary(pl.UTF-8): Biblioteka Shapefile dla C
Name: shapelib
-Version: 1.3.0
-Release: 2
+Version: 1.4.1
+Release: 1
License: MIT or LGPL
Group: Libraries
-Source0: ftp://ftp.remotesensing.org/shapelib/%{name}-%{version}.tar.gz
-# Source0-md5: 2ff7d0b21d4b7506b452524492795f77
-Patch0: %{name}-make.patch
-URL: http://www.remotesensing.org/
+Source0: http://download.osgeo.org/shapelib/%{name}-%{version}.tar.gz
+# Source0-md5: ae9f1fcd2adda35b74ac4da8674a3178
+URL: http://shapelib.maptools.org/
+BuildRequires: autoconf >= 2.62
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: proj-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# broken
-%undefine with_ccache
-
%description
The Shapefile C Library provides the ability to write simple C
programs for reading, writing and updating (to a limited extent) ESRI
@@ -52,28 +50,21 @@ Statyczna biblioteka shapelib.
%prep
%setup -q
-%patch0 -p1
%build
-%{__make} lib all \
- CC="%{__cc}" \
- CFLAGS="%{rpmcflags}" \
- libdir=%{_libdir}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/libshp}
-%{__make} lib_install \
- libdir=%{_libdir} \
- includedir=%{_includedir}/libshp \
+%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-for p in dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind shptest;
do
- libtool --mode=install install $p $RPM_BUILD_ROOT%{_bindir}
-done
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -83,16 +74,18 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc ChangeLog README* web/*.html
+%attr(755,root,root) %{_bindir}/Shape_PointInPoly
%attr(755,root,root) %{_bindir}/dbf*
%attr(755,root,root) %{_bindir}/shp*
%attr(755,root,root) %{_libdir}/libshp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libshp.so.1
+%attr(755,root,root) %ghost %{_libdir}/libshp.so.2
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libshp.so
%{_libdir}/libshp.la
-%{_includedir}/libshp
+%{_includedir}/shapefil.h
+%{_pkgconfigdir}/shapelib.pc
%files static
%defattr(644,root,root,755)
diff --git a/shapelib-make.patch b/shapelib-make.patch
deleted file mode 100644
index c1b6bfe..0000000
--- a/shapelib-make.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- shapelib-1.3.0/Makefile.orig 2011-07-24 06:32:26.000000000 +0200
-+++ shapelib-1.3.0/Makefile 2012-04-13 18:55:30.562909803 +0200
-@@ -3,6 +3,8 @@
- CFLAGS = -g -Wall -fPIC
- #CFLAGS = -g -DUSE_CPL
- #CC = g++
-+libdir = /usr/local/lib
-+includedir = /usr/local/include
-
- LIBOBJ = shpopen.o dbfopen.o safileio.o shptree.o
- SHPBIN = shpcreate shpadd shpdump shprewind dbfcreate dbfadd
dbfdump \
-@@ -24,35 +26,35 @@
- safileio.o: safileio.c shapefil.h
- $(CC) $(CFLAGS) -c safileio.c
-
--shpcreate: shpcreate.c shpopen.o safileio.o
-- $(CC) $(CFLAGS) shpcreate.c shpopen.o safileio.o $(LINKOPT) -o shpcreate
-+shpcreate: shpcreate.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) shpcreate.c libshp.la $(LINKOPT) -o
shpcreate
-
--shpadd: shpadd.c shpopen.o safileio.o
-- $(CC) $(CFLAGS) shpadd.c shpopen.o safileio.o $(LINKOPT) -o shpadd
-+shpadd: shpadd.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) shpadd.c libshp.la $(LINKOPT) -o
shpadd
-
--shpdump: shpdump.c shpopen.o safileio.o
-- $(CC) $(CFLAGS) shpdump.c shpopen.o safileio.o $(LINKOPT) -o shpdump
-+shpdump: shpdump.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) shpdump.c libshp.la $(LINKOPT) -o
shpdump
-
--shprewind: shprewind.c shpopen.o safileio.o
-- $(CC) $(CFLAGS) shprewind.c shpopen.o safileio.o $(LINKOPT) -o shprewind
-+shprewind: shprewind.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) shprewind.c libshp.la $(LINKOPT) -o
shprewind
-
--dbfcreate: dbfcreate.c dbfopen.o safileio.o
-- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o safileio.o $(LINKOPT) -o dbfcreate
-+dbfcreate: dbfcreate.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) dbfcreate.c libshp.la $(LINKOPT) -o
dbfcreate
-
--dbfadd: dbfadd.c dbfopen.o safileio.o
-- $(CC) $(CFLAGS) dbfadd.c dbfopen.o safileio.o $(LINKOPT) -o dbfadd
-+dbfadd: dbfadd.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) dbfadd.c libshp.la $(LINKOPT) -o
dbfadd
-
--dbfdump: dbfdump.c dbfopen.o safileio.o
-- $(CC) $(CFLAGS) dbfdump.c dbfopen.o safileio.o $(LINKOPT) -o dbfdump
-+dbfdump: dbfdump.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) dbfdump.c libshp.la $(LINKOPT) -o
dbfdump
-
--shptest: shptest.c shpopen.o safileio.o
-- $(CC) $(CFLAGS) shptest.c shpopen.o safileio.o $(LINKOPT) -o shptest
-+shptest: shptest.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) shptest.c libshp.la $(LINKOPT) -o
shptest
-
--shputils: shputils.c shpopen.o safileio.o dbfopen.o
-- $(CC) $(CFLAGS) shputils.c shpopen.o safileio.o dbfopen.o $(LINKOPT)
-o shputils
-+shputils: shputils.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) shputils.c libshp.la $(LINKOPT) -o
shputils
-
--shptreedump: shptreedump.c shptree.o shpopen.o safileio.o
-- $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o safileio.o $(LINKOPT)
\
-+shptreedump: shptreedump.c libshp.la
-+ libtool --mode=link $(CC) $(CFLAGS) shptreedump.c libshp.la $(LINKOPT) \
- -o shptreedump
-
- clean:
-@@ -97,14 +99,17 @@
- fi
-
-
--lib: libshp.a
-+lib: libshp.la
-
--libshp.a: $(LIBOBJ)
-- ar r libshp.a $(LIBOBJ)
-+libshp.la: $(LIBOBJ:%.o=%.lo)
-+ libtool --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o libshp.la
$(LIBOBJ:%.o=%.lo) -rpath $(libdir) -version-info 2:0:1
-
--lib_install: libshp.a
-- cp libshp.a $(PREFIX)/lib
-- cp shapefil.h $(PREFIX)/include
-+%.lo: %.c
-+ libtool --mode=compile $(CC) -c $(CFLAGS) -o $@ $<
-+
-+lib_install: libshp.la
-+ libtool --mode=install install libshp.la $(DESTDIR)$(libdir)
-+ cp shapefil.h $(DESTDIR)$(includedir)
-
- bin_install: $(SHPBIN)
- cp $(SHPBIN) $(PREFIX)/bin
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/shapelib.git/commitdiff/44ac6d31d4225f81a79aa379fa7dc5e34ea7e6bf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
