From 6f2b6abe677633a17f28a6a611c7647bc9f82889 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 20 Jun 2010 10:48:45 +0000 Subject: [PATCH] - updated to 1.3.0 (new soname) - added opt patch, removed obsolete shared-fix,link patches Changed files: libgeotiff-link.patch -> 1.2 libgeotiff-opt.patch -> 1.1 libgeotiff-shared-fix.patch -> 1.7 libgeotiff.spec -> 1.21 --- libgeotiff-link.patch | 32 -------------------------------- libgeotiff-opt.patch | 13 +++++++++++++ libgeotiff-shared-fix.patch | 11 ----------- libgeotiff.spec | 35 +++++++++++++++++++++-------------- 4 files changed, 34 insertions(+), 57 deletions(-) delete mode 100644 libgeotiff-link.patch create mode 100644 libgeotiff-opt.patch delete mode 100644 libgeotiff-shared-fix.patch diff --git a/libgeotiff-link.patch b/libgeotiff-link.patch deleted file mode 100644 index 1889b12..0000000 --- a/libgeotiff-link.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- libgeotiff-1.2.5/bin/Makefile.in.orig 2006-07-20 17:45:48.000000000 +0200 -+++ libgeotiff-1.2.5/bin/Makefile.in 2008-08-24 09:08:47.926113358 +0200 -@@ -6,7 +6,7 @@ - GEOTIFFDIR = $(DEPTH) - GEOTIFF_SO=@GEOTIFF_SO@ - --LIBS= -L$(GEOTIFFDIR) -lgeotiff @LIBS@ -+LIBS= -L$(GEOTIFFDIR) -lgeotiff -L${libdir} @LIBS@ - - # - SHELL = /bin/sh -@@ -46,16 +46,16 @@ - all: ${ALL} - - makegeo$(EXEEXT): makegeo.o ${GEOTIFFDIR}/libgeotiff.a -- ${CC} ${COPTS} makegeo.o -L${libdir} ${LIBS} -o $@ -+ ${CC} ${COPTS} makegeo.o ${LIBS} -o $@ - - geotifcp$(EXEEXT): geotifcp.o ${GEOTIFFDIR}/libgeotiff.a -- ${CC} ${COPTS} geotifcp.o -L${libdir} ${LIBS} -o $@ -+ ${CC} ${COPTS} geotifcp.o ${LIBS} -o $@ - - listgeo$(EXEEXT): listgeo.o ${GEOTIFFDIR}/libgeotiff.a -- ${CC} ${COPTS} listgeo.o -L${libdir} ${LIBS} -o $@ -+ ${CC} ${COPTS} listgeo.o ${LIBS} -o $@ - - csv2html$(EXEEXT): csv2html.o ${GEOTIFFDIR}/libgeotiff.a -- ${CC} ${COPTS} csv2html.o -L${libdir} ${LIBS} -o $@ -+ ${CC} ${COPTS} csv2html.o ${LIBS} -o $@ - - clean: - rm -f ${ALL} ${OBJS} core a.out newgeo.tif ${GEOTIFF_SO} diff --git a/libgeotiff-opt.patch b/libgeotiff-opt.patch new file mode 100644 index 0000000..69eb6e7 --- /dev/null +++ b/libgeotiff-opt.patch @@ -0,0 +1,13 @@ +--- libgeotiff-1.3.0/configure.ac.orig 2009-11-02 16:37:11.000000000 +0100 ++++ libgeotiff-1.3.0/configure.ac 2010-06-20 09:54:26.607446450 +0200 +@@ -84,8 +84,8 @@ + CXXFLAGS="$CXXFLAGS -g -DDEBUG -Wall -Wno-long-long -pedantic -std=c++98" + AC_MSG_RESULT(yes) + else +- CFLAGS="$CFLAGS -O3 -DNDEBUG" +- CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG" ++ CFLAGS="$CFLAGS -DNDEBUG" ++ CXXFLAGS="$CXXFLAGS -DNDEBUG" + AC_MSG_RESULT(no) + fi + diff --git a/libgeotiff-shared-fix.patch b/libgeotiff-shared-fix.patch deleted file mode 100644 index 7d22b15..0000000 --- a/libgeotiff-shared-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libgeotiff-1.2.3/Makefile.in.orig 2005-08-16 17:21:20.000000000 +0200 -+++ libgeotiff-1.2.3/Makefile.in 2006-03-04 23:07:56.028526750 +0100 -@@ -100,7 +100,7 @@ - ${RANLIB} libgeotiff.a - - $(GEOTIFF_SO): ${OBJS} -- ${LD_SHARED} ${OBJS} ${LIBS} -o $(GEOTIFF_SO) -+ ${CC} -shared ${OBJS} ${LIBS} -o $(GEOTIFF_SO) -Wl,-soname=libgeotiff.so.$(VERSION_MAJOR) - rm -f libgeotiff.$(SO_EXT) - ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT) - diff --git a/libgeotiff.spec b/libgeotiff.spec index 216125e..7d07b09 100644 --- a/libgeotiff.spec +++ b/libgeotiff.spec @@ -1,18 +1,19 @@ Summary: GeoTIFF library Summary(pl.UTF-8): Biblioteka GeoTIFF Name: libgeotiff -Version: 1.2.5 -Release: 3 +Version: 1.3.0 +Release: 1 License: MIT, partially Public Domain (see LICENSE) Group: Libraries Source0: ftp://ftp.remotesensing.org/geotiff/libgeotiff/%{name}-%{version}.tar.gz -# Source0-md5: 000f247a88510f1b38d4b314d1e47048 -Patch0: %{name}-shared-fix.patch -Patch1: %{name}-link.patch +# Source0-md5: 6ac3c22e44711e9a3add9044e40b9527 +Patch0: %{name}-opt.patch URL: http://www.remotesensing.org/geotiff/geotiff.html +BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: libjpeg-devel BuildRequires: libtiff-devel >= 3.6.0 +BuildRequires: libtool BuildRequires: proj-devel BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -55,14 +56,16 @@ Statyczna biblioteka GeoTIFF. %prep %setup -q %patch0 -p1 -%patch1 -p1 - -# workaround not to rebuild configure on make -touch configure %build -cp -f /usr/share/automake/config.* . -%configure +%{__libtoolize} +%{__aclocal} -I m4 +%{__autoconf} +%{__autoheader} +%{__automake} +%configure \ + --with-jpeg \ + --with-zip %{__make} @@ -80,16 +83,20 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog LICENSE README docs/*.{html,dox,txt} +%doc ChangeLog LICENSE README +%attr(755,root,root) %{_bindir}/applygeo +%attr(755,root,root) %{_bindir}/csv2html %attr(755,root,root) %{_bindir}/geotifcp %attr(755,root,root) %{_bindir}/listgeo -%attr(755,root,root) %{_libdir}/libgeotiff.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libgeotiff.so.1 +%attr(755,root,root) %{_bindir}/makegeo +%attr(755,root,root) %{_libdir}/libgeotiff.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgeotiff.so.2 %{_datadir}/epsg_csv %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libgeotiff.so +%{_libdir}/libgeotiff.la %{_includedir}/cpl_serv.h %{_includedir}/geo_*.h %{_includedir}/geokeys.h -- 2.44.0