packages: libgeotiff/libgeotiff.spec, libgeotiff/libgeotiff-opt.patch (NEW)...

[qboosh]

Author: qboosh                       Date: Sun Jun 20 10:48:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.3.0 (new soname)
- added opt patch, removed obsolete shared-fix,link patches

---- Files affected:
packages/libgeotiff:
   libgeotiff.spec (1.20 -> 1.21) , libgeotiff-opt.patch (NONE -> 1.1)  (NEW), libgeotiff-link.patch (1.1 -> NONE)  (REMOVED), libgeotiff-shared-fix.patch (1.6 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libgeotiff/libgeotiff.spec
diff -u packages/libgeotiff/libgeotiff.spec:1.20 packages/libgeotiff/libgeotiff.spec:1.21
--- packages/libgeotiff/libgeotiff.spec:1.20	Thu Jan 28 19:20:13 2010
+++ packages/libgeotiff/libgeotiff.spec	Sun Jun 20 12:48:45 2010
@@ -2,18 +2,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)
@@ -56,14 +57,16 @@
 %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}
 
@@ -81,16 +84,20 @@
 
 %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
@@ -113,6 +120,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2010/06/20 10:48:45  qboosh
+- updated to 1.3.0 (new soname)
+- added opt patch, removed obsolete shared-fix,link patches
+
 Revision 1.20  2010/01/28 18:20:13  arekm
 - release 3
 

================================================================
Index: packages/libgeotiff/libgeotiff-opt.patch
diff -u /dev/null packages/libgeotiff/libgeotiff-opt.patch:1.1
--- /dev/null	Sun Jun 20 12:48:51 2010
+++ packages/libgeotiff/libgeotiff-opt.patch	Sun Jun 20 12:48:45 2010
@@ -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
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgeotiff/libgeotiff.spec?r1=1.20&r2=1.21&f=u