Author: qboosh Date: Fri Apr 13 19:37:08 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.3.0
- updated make patch (now it also restores shared lib building)
---- Files affected:
packages/shapelib:
shapelib-make.patch (1.1 -> 1.2) , shapelib.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/shapelib/shapelib-make.patch
diff -u packages/shapelib/shapelib-make.patch:1.1
packages/shapelib/shapelib-make.patch:1.2
--- packages/shapelib/shapelib-make.patch:1.1 Fri Oct 21 00:14:09 2005
+++ packages/shapelib/shapelib-make.patch Fri Apr 13 21:37:02 2012
@@ -1,124 +1,91 @@
---- shapelib-1.2.10/Makefile.orig 2003-04-07 15:03:22.000000000 +0200
-+++ shapelib-1.2.10/Makefile 2005-10-20 23:55:28.785757568 +0200
-@@ -1,6 +1,8 @@
-
- #LINKOPT = /usr/local/lib/libdbmalloc.a
- CFLAGS = -g
+--- 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
- default: all
-
-@@ -15,35 +17,35 @@
- dbfopen.o: dbfopen.c shapefil.h
- $(CC) $(CFLAGS) -c dbfopen.c
+ 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
-- $(CC) $(CFLAGS) shpcreate.c shpopen.o $(LINKOPT) -o shpcreate
+-shpcreate: shpcreate.c shpopen.o safileio.o
+- $(CC) $(CFLAGS) shpcreate.c shpopen.o safileio.o $(LINKOPT) -o shpcreate
+shpcreate: shpcreate.c libshp.la
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shpcreate.c libshp.la
$(LINKOPT) -o shpcreate
++ libtool --mode=link $(CC) $(CFLAGS) shpcreate.c libshp.la $(LINKOPT) -o
shpcreate
--shpadd: shpadd.c shpopen.o
-- $(CC) $(CFLAGS) shpadd.c shpopen.o $(LINKOPT) -o shpadd
+-shpadd: shpadd.c shpopen.o safileio.o
+- $(CC) $(CFLAGS) shpadd.c shpopen.o safileio.o $(LINKOPT) -o shpadd
+shpadd: shpadd.c libshp.la
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shpadd.c libshp.la
$(LINKOPT) -o shpadd
++ libtool --mode=link $(CC) $(CFLAGS) shpadd.c libshp.la $(LINKOPT) -o
shpadd
--shpdump: shpdump.c shpopen.o
-- $(CC) $(CFLAGS) shpdump.c shpopen.o $(LINKOPT) -o shpdump
+-shpdump: shpdump.c shpopen.o safileio.o
+- $(CC) $(CFLAGS) shpdump.c shpopen.o safileio.o $(LINKOPT) -o shpdump
+shpdump: shpdump.c libshp.la
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shpdump.c libshp.la
$(LINKOPT) -o shpdump
++ libtool --mode=link $(CC) $(CFLAGS) shpdump.c libshp.la $(LINKOPT) -o
shpdump
--shprewind: shprewind.c shpopen.o
-- $(CC) $(CFLAGS) shprewind.c shpopen.o $(LINKOPT) -o shprewind
+-shprewind: shprewind.c shpopen.o safileio.o
+- $(CC) $(CFLAGS) shprewind.c shpopen.o safileio.o $(LINKOPT) -o shprewind
+shprewind: shprewind.c libshp.la
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shprewind.c libshp.la
$(LINKOPT) -o shprewind
++ libtool --mode=link $(CC) $(CFLAGS) shprewind.c libshp.la $(LINKOPT) -o
shprewind
--dbfcreate: dbfcreate.c dbfopen.o
-- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o $(LINKOPT) -o dbfcreate
+-dbfcreate: dbfcreate.c dbfopen.o safileio.o
+- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o safileio.o $(LINKOPT) -o dbfcreate
+dbfcreate: dbfcreate.c libshp.la
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) dbfcreate.c libshp.la
$(LINKOPT) -o dbfcreate
++ libtool --mode=link $(CC) $(CFLAGS) dbfcreate.c libshp.la $(LINKOPT) -o
dbfcreate
--dbfadd: dbfadd.c dbfopen.o
-- $(CC) $(CFLAGS) dbfadd.c dbfopen.o $(LINKOPT) -o dbfadd
+-dbfadd: dbfadd.c dbfopen.o safileio.o
+- $(CC) $(CFLAGS) dbfadd.c dbfopen.o safileio.o $(LINKOPT) -o dbfadd
+dbfadd: dbfadd.c libshp.la
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) dbfadd.c libshp.la
$(LINKOPT) -o dbfadd
++ libtool --mode=link $(CC) $(CFLAGS) dbfadd.c libshp.la $(LINKOPT) -o
dbfadd
--dbfdump: dbfdump.c dbfopen.o
-- $(CC) $(CFLAGS) dbfdump.c dbfopen.o $(LINKOPT) -o dbfdump
+-dbfdump: dbfdump.c dbfopen.o safileio.o
+- $(CC) $(CFLAGS) dbfdump.c dbfopen.o safileio.o $(LINKOPT) -o dbfdump
+dbfdump: dbfdump.c libshp.la
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) dbfdump.c libshp.la
$(LINKOPT) -o dbfdump
++ libtool --mode=link $(CC) $(CFLAGS) dbfdump.c libshp.la $(LINKOPT) -o
dbfdump
--shptest: shptest.c shpopen.o
-- $(CC) $(CFLAGS) shptest.c shpopen.o $(LINKOPT) -o shptest
+-shptest: shptest.c shpopen.o safileio.o
+- $(CC) $(CFLAGS) shptest.c shpopen.o safileio.o $(LINKOPT) -o shptest
+shptest: shptest.c libshp.la
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shptest.c libshp.la
$(LINKOPT) -o shptest
++ libtool --mode=link $(CC) $(CFLAGS) shptest.c libshp.la $(LINKOPT) -o
shptest
--shputils: shputils.c shpopen.o dbfopen.o
-- $(CC) $(CFLAGS) shputils.c shpopen.o dbfopen.o $(LINKOPT) -o shputils
+-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
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shputils.c libshp.la
$(LINKOPT) -o shputils
++ libtool --mode=link $(CC) $(CFLAGS) shputils.c libshp.la $(LINKOPT) -o
shputils
--shptreedump: shptreedump.c shptree.o shpopen.o
-- $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o $(LINKOPT) \
+-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
-+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shptreedump.c libshp.la
$(LINKOPT) \
++ libtool --mode=link $(CC) $(CFLAGS) shptreedump.c libshp.la $(LINKOPT) \
-o shptreedump
clean:
-@@ -98,45 +100,16 @@
- SHPLIB_VERSION=1.2.9
- LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0),
sorry
-
--lib:
-- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include
-g -O2 -c shpopen.c
-- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shpopen.c
-o .libs/shpopen.lo
-- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o
>/dev/null 2>&1
-- mv -f .libs/shpopen.lo shpopen.lo
-- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include
-g -O2 -c shptree.c
-- rm -f .libs/shptree.lo
-- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shptree.c
-o .libs/shptree.lo
-- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o
>/dev/null 2>&1
-- mv -f .libs/shptree.lo shptree.lo
-- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include
-g -O2 -c dbfopen.c
-- rm -f .libs/dbfopen.lo
-- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC dbfopen.c
-o .libs/dbfopen.lo
-- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o
>/dev/null 2>&1
-- mv -f .libs/dbfopen.lo dbfopen.lo
-- /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath
/usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
-- rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
-- rm -fr .libs/libshp.lax
-- mkdir .libs/libshp.lax
-- /usr/bin/ld -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)
shpopen.lo shptree.lo dbfopen.lo -lc
--
-- (cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION)
libshp.so.1)
-- (cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION)
libshp.so)
-- ar cru .libs/libshp.a shpopen.o shptree.o dbfopen.o
-- ranlib .libs/libshp.a
-- rm -fr .libs/libshp.lax
-- (cd .libs && rm -f libshp.la && ln -s ../libshp.la libshp.la)
+@@ -97,14 +99,17 @@
+ fi
+
+
+-lib: libshp.a
+lib: libshp.la
-+
-+libshp.la:
-+ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include
$(CFLAGS) -c shpopen.c
-+ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include
$(CFLAGS) -c shptree.c
-+ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include
$(CFLAGS) -c dbfopen.c
-+ /bin/sh ./libtool --mode=link $(CC) -o libshp.la -rpath $(libdir)
-version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
-
- lib_install:
-- cp .libs/libshp.la .libs/libshp.lai
-- /bin/sh ./mkinstalldirs /usr/local/lib
-- /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la
/usr/local/lib/libshp.la
-- /usr/bin/install -c .libs/libshp.so.$(LIBSHP_VERSION)
/usr/local/lib/libshp.so.$(LIBSHP_VERSION)
-- (cd /usr/local/lib && rm -f libshp.so.1 && ln -s
libshp.so.$(LIBSHP_VERSION) libshp.so.1)
-- (cd /usr/local/lib && rm -f libshp.so && ln -s
libshp.so.$(LIBSHP_VERSION) libshp.so)
-- chmod +x /usr/local/lib/libshp.so.$(LIBSHP_VERSION)
-- /usr/bin/install -c .libs/libshp.la /usr/local/lib/libshp.la
-- /usr/bin/install -c .libs/libshp.a /usr/local/lib/libshp.a
-- ranlib /usr/local/lib/libshp.a
-- chmod 644 /usr/local/lib/libshp.a
-- /bin/sh ./mkinstalldirs /usr/local/include/libshp
-- /usr/bin/install -c -m 644 shapefil.h
/usr/local/include/libshp/shapefil.h
-+ /bin/sh ./mkinstalldirs $(DESTDIR)$(libdir)
-+ /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la
$(DESTDIR)$(libdir)/libshp.la
-+ /bin/sh ./mkinstalldirs $(DESTDIR)$(includedir)/libshp
-+ /usr/bin/install -c -m 644 shapefil.h
$(DESTDIR)$(includedir)/libshp/shapefil.h
+
+-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
================================================================
Index: packages/shapelib/shapelib.spec
diff -u packages/shapelib/shapelib.spec:1.5 packages/shapelib/shapelib.spec:1.6
--- packages/shapelib/shapelib.spec:1.5 Sun Feb 19 13:58:23 2012
+++ packages/shapelib/shapelib.spec Fri Apr 13 21:37:02 2012
@@ -4,12 +4,12 @@
Summary: Shapefile C Library
Summary(pl.UTF-8): Biblioteka Shapefile dla C
Name: shapelib
-Version: 1.2.10
+Version: 1.3.0
Release: 1
License: MIT or LGPL
Group: Libraries
Source0: ftp://ftp.remotesensing.org/shapelib/%{name}-%{version}.tar.gz
-# Source0-md5: 4d96bd926167193d27bf14d56e2d484e
+# Source0-md5: 2ff7d0b21d4b7506b452524492795f77
Patch0: %{name}-make.patch
URL: http://www.remotesensing.org/
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,14 +63,16 @@
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}}
+
%{__make} lib_install \
libdir=%{_libdir} \
- includedir=%{_includedir} \
+ includedir=%{_includedir}/libshp \
DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
for p in dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind shptest;
do
- sh ./libtool --mode=install install $p $RPM_BUILD_ROOT%{_bindir}
+ libtool --mode=install install $p $RPM_BUILD_ROOT%{_bindir}
done
%clean
@@ -81,11 +83,11 @@
%files
%defattr(644,root,root,755)
-%doc ChangeLog README* *.html
+%doc ChangeLog README* web/*.html
%attr(755,root,root) %{_bindir}/dbf*
%attr(755,root,root) %{_bindir}/shp*
%attr(755,root,root) %{_libdir}/libshp.so.*.*.*
-%ghost %{_libdir}/libshp.so.1
+%attr(755,root,root) %ghost %{_libdir}/libshp.so.1
%files devel
%defattr(644,root,root,755)
@@ -103,6 +105,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2012/04/13 19:37:02 qboosh
+- updated to 1.3.0
+- updated make patch (now it also restores shared lib building)
+
Revision 1.5 2012/02/19 12:58:23 qboosh
- updated Source URL
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/shapelib/shapelib-make.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/shapelib/shapelib.spec?r1=1.5&r2=1.6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
