- 1.2.0, updated shared-fix patch, removed obsolete DESTDIR patch

Changed files:
    libgeotiff-DESTDIR.patch -> 1.2
    libgeotiff-shared-fix.patch -> 1.2
    libgeotiff.spec -> 1.3

diff --git a/libgeotiff-DESTDIR.patch b/libgeotiff-DESTDIR.patch
deleted file mode 100644 (file)
index 16b081f..0000000
--- a/libgeotiff-DESTDIR.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libgeotiff-1.1.4/Makefile.in.orig  Tue Dec 12 20:03:19 2000
-+++ libgeotiff-1.1.4/Makefile.in       Mon Jun 17 23:53:29 2002
-@@ -194,24 +194,24 @@
-       autoconf
- 
- install:
--      $(INSTALL) -d $(libdir)
--      $(INSTALL) libgeotiff.a ${libdir}
--      $(INSTALL) -d $(includedir)
--      $(INSTALL) $(GT_INCLUDE_FILES) $(includedir)
--      $(INSTALL) -d $(datadir)
--      $(INSTALL) csv/*.csv $(datadir)
--      $(INSTALL) -d $(bindir)
--      $(INSTALL) bin/listgeo bin/geotifcp $(bindir)
-+      $(INSTALL) -d $(DESTDIR)$(libdir)
-+      $(INSTALL) libgeotiff.a $(DESTDIR)${libdir}
-+      $(INSTALL) -d $(DESTDIR)$(includedir)
-+      $(INSTALL) $(GT_INCLUDE_FILES) $(DESTDIR)$(includedir)
-+      $(INSTALL) -d $(DESTDIR)$(datadir)
-+      $(INSTALL) csv/*.csv $(DESTDIR)$(datadir)
-+      $(INSTALL) -d $(DESTDIR)$(bindir)
-+      $(INSTALL) bin/listgeo bin/geotifcp $(DESTDIR)$(bindir)
-       if test ! -z "$(GEOTIFF_SO)" ; then \
--         $(INSTALL) $(GEOTIFF_SO) ${libdir}; \
--         rm -f ${libdir}/libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR); \
--         ${LN} ${libdir}/$(GEOTIFF_SO) ${libdir}/libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR); \
--         rm -f ${libdir}/libgeotiff.so.$(VERSION_MAJOR); \
-+         $(INSTALL) $(GEOTIFF_SO) $(DESTDIR)${libdir}; \
-+         rm -f $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR); \
-+         ${LN} ${libdir}/$(GEOTIFF_SO) $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR); \
-+         rm -f $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR); \
-          ${LN} ${libdir}/libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR) \
--              ${libdir}/libgeotiff.so.$(VERSION_MAJOR); \
--         rm -f ${libdir}/libgeotiff.so; \
-+              $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR); \
-+         rm -f $(DESTDIR)${libdir}/libgeotiff.so; \
-          ${LN} ${libdir}/libgeotiff.so.$(VERSION_MAJOR) \
--              ${libdir}/libgeotiff.so; \
-+              $(DESTDIR)${libdir}/libgeotiff.so; \
-       fi
- 
- 

diff --git a/libgeotiff-shared-fix.patch b/libgeotiff-shared-fix.patch
index ad946e38e22558230bac22a2d34941be1b3eb58f..c645ff1ec8f41940d9c4ce8c88059e779ee05fca 100644 (file)
--- a/libgeotiff-shared-fix.patch
+++ b/libgeotiff-shared-fix.patch
@@ -1,106 +1,21 @@
---- libgeotiff-1.1.4/Makefile.in.orig  Mon Jun 17 23:58:01 2002
-+++ libgeotiff-1.1.4/Makefile.in       Tue Jun 18 00:06:36 2002
-@@ -10,6 +10,7 @@
- NULL    =
- CD      = cd
- CC      = @CC@
-+C_PIC = @C_PIC@
- AR      = ar
- LN      = @LN_S@
- AROPTS  = r
-@@ -108,7 +108,7 @@
+--- libgeotiff-1.2.0/Makefile.in.orig  Wed Jun 19 05:52:12 2002
++++ libgeotiff-1.2.0/Makefile.in       Sun Jan 19 01:14:01 2003
+@@ -50,8 +50,7 @@
+ #
+ IPATH   = -I. -I${SRCDIR} @TIFF_INC@ @PROJ_INC@
+ #
+-CONF_LIBRARY=\
+-      ${NULL}
++CONF_LIBRARY=@C_PIC@
+ COPTS = @CFLAGS@ -DCSV_DATA_DIR=\"$(datadir)\"
+ CFLAGS  = ${COPTS} ${IPATH} ${CONF_LIBRARY}
+ #
+@@ -111,7 +110,7 @@
        ${RANLIB} libgeotiff.a
  
- libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT): ${OBJS}
+ $(GEOTIFF_SO): ${OBJS}
 -      ${LD_SHARED} ${OBJS} ${LIBS} -o $(GEOTIFF_SO)
-+      ${LD_SHARED} ${OBJS} ${LIBS} -o $(GEOTIFF_SO) -soname libgeotiff.so.$(VERSION_MAJOR)
++      ${CC} -shared ${OBJS} ${LIBS} -o $(GEOTIFF_SO) -Wl,-soname=libgeotiff.so.$(VERSION_MAJOR)
        rm -f libgeotiff.so
        ${LN} $(GEOTIFF_SO) libgeotiff.so
  
-@@ -123,52 +124,52 @@
-       ${LN} ${LIB_XTIFF}/*.h .
- 
- ${XTIFF}: ${LIB_XTIFF}/xtiff.c  ${XTIFFINC}
--      ${CC} -c ${CFLAGS}  ${LIB_XTIFF}/xtiff.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${LIB_XTIFF}/xtiff.c
- 
- geo_free.o: ${SRCDIR}/geo_free.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_free.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_free.c
- 
- geo_get.o: ${SRCDIR}/geo_get.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_get.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_get.c
- 
- geo_names.o: ${SRCDIR}/geo_names.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_names.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_names.c
- 
- geo_new.o: ${SRCDIR}/geo_new.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_new.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_new.c
- 
- geo_print.o: ${SRCDIR}/geo_print.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_print.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_print.c
- 
- geo_set.o: ${SRCDIR}/geo_set.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_set.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_set.c
- 
- geo_tiffp.o: ${SRCDIR}/geo_tiffp.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_tiffp.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_tiffp.c
- 
- geo_write.o: ${SRCDIR}/geo_write.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_write.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_write.c
- 
- geo_trans.o: ${SRCDIR}/geo_trans.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_trans.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_trans.c
- 
- geo_normalize.o: ${SRCDIR}/geo_normalize.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_normalize.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_normalize.c
- 
- geo_extra.o: ${SRCDIR}/geo_extra.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geo_extra.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geo_extra.c
- 
- cpl_csv.o: ${SRCDIR}/cpl_csv.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/cpl_csv.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/cpl_csv.c
- 
- cpl_serv.o: ${SRCDIR}/cpl_serv.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/cpl_serv.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/cpl_serv.c
- 
- geotiff_proj4.o: ${SRCDIR}/geotiff_proj4.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/geotiff_proj4.c
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/geotiff_proj4.c
- 
- ${SRCDIR}/csv/%.o:    ${SRCDIR}/csv/%.c
--      ${CC} -c ${CFLAGS} ${SRCDIR}/csv/$*.c -o ${SRCDIR}/csv/$*.o
-+      ${CC} -c ${CFLAGS} $(C_PIC) ${SRCDIR}/csv/$*.c -o ${SRCDIR}/csv/$*.o
- 
- clean:
-       rm -f ${TARGETS} ${OBJS} ${XTIFFINC} core a.out
-@@ -204,14 +204,10 @@
-       $(INSTALL) bin/listgeo bin/geotifcp $(DESTDIR)$(bindir)
-       if test ! -z "$(GEOTIFF_SO)" ; then \
-          $(INSTALL) $(GEOTIFF_SO) $(DESTDIR)${libdir}; \
--         rm -f $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR); \
--         ${LN} ${libdir}/$(GEOTIFF_SO) $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR); \
--         rm -f $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR); \
--         ${LN} ${libdir}/libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR) \
--              $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR); \
-+         rm -f $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR) \
-+         ${LN} ${libdir}/$(GEOTIFF_SO) $(DESTDIR)${libdir}/libgeotiff.so.$(VERSION_MAJOR) \
-          rm -f $(DESTDIR)${libdir}/libgeotiff.so; \
--         ${LN} ${libdir}/libgeotiff.so.$(VERSION_MAJOR) \
--              $(DESTDIR)${libdir}/libgeotiff.so; \
-+         ${LN} ${libdir}/$(GEOTIFF_SO) $(DESTDIR)${libdir}/libgeotiff.so; \
-       fi
- 
- 

diff --git a/libgeotiff.spec b/libgeotiff.spec
index 0e0e2ac7beb3808c016501f931c50da3dd6cbdaf..1f5bb0513eda579ca20ed83edd9d8ca3970194f3 100644 (file)
--- a/libgeotiff.spec
+++ b/libgeotiff.spec
@@ -1,16 +1,15 @@
 Summary:       GeoTIFF library
 Summary(pl):   Biblioteka GeoTIFF
 Name:          libgeotiff
-Version:       1.1.4
+Version:       1.2.0
 Release:       1
 License:       MIT, partially Public Domain (see LICENSE)
 Group:         Libraries
 Source0:       ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/%{name}-%{version}.tar.gz
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-shared-fix.patch
+Patch0:                %{name}-shared-fix.patch
 URL:           http://www.remotesensing.org/geotiff/geotiff.html
 BuildRequires: libjpeg-devel
-BuildRequires: libtiff-devel
+BuildRequires: libtiff-devel >= 3.6.0
 BuildRequires: proj-devel
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,7 +52,6 @@ Statyczna biblioteka GeoTIFF.
 %prep
 %setup -q 
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure2_13
@@ -73,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog LICENSE README docs/*
+%doc ChangeLog LICENSE README docs/*.{html,dox,txt}
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_datadir}/epsg_csv