Merge remote-tracking branch 'stevee/libtiff'

Conflicts:
	libtiff/libtiff.nm

diff --cc libtiff/libtiff.nm
index 35bb8224b7a3641a01da45970672794d504ea1fe,86334feb371788116f0f889957f73cd2053720ab..d81e2d49bc45727b57e47a2626151ae1365e1a58
--- 1/libtiff/libtiff.nm
--- 2/libtiff/libtiff.nm
+++ b/libtiff/libtiff.nm
@@@ -4,11 -4,11 +4,12 @@@
  ###############################################################################
  
  name       = libtiff
- version    = 4.0.0beta7
+ version    = 4.0.0
 -release    = 1
 +release    = 2
++thisapp    = tiff-%{version}
  
  groups     = System/Libraries
- url        = http://www.libtiff.org
+ url        = http://www.remotesensing.org/libtiff/
  license    = libtiff ( own )
  summary    = Library of functions for manipulating TIFF format image files.
  
@@@ -19,8 -19,9 +20,7 @@@ descriptio
        .tif extension and they are often quite large.
  end
  
- source_dl  =
- sources    = tiff-%{version}.tar.gz
 -thisapp = tiff-%{version}
 -
+ source_dl  = ftp://ftp.remotesensing.org/pub/libtiff/
  
  build
        requires