From 7a93681428fa9e518fa570e3a17a7f8f709785de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= <volker27@gmx.at>
Date: Thu, 10 May 2012 01:08:28 +0200
Subject: [PATCH] Rebuild for libtiff 4 plus cosmetics

---
 libgeotiff.spec | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/libgeotiff.spec b/libgeotiff.spec
index 7c7a3d7..8f03599 100644
--- a/libgeotiff.spec
+++ b/libgeotiff.spec
@@ -1,13 +1,13 @@
 Name:      libgeotiff
 Version:   1.2.5
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   GeoTIFF format library
 Group:     System Environment/Libraries
 License:   MIT
 URL:       http://www.remotesensing.org/geotiff/geotiff.html
-Source:    ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/%{name}-%{version}.tar.gz
-Patch0:    libgeotiff-soname.patch
-Patch1:    libgeotiff-multilib.patch
+Source:    ftp://ftp.remotesensing.org/pub/geotiff/%{name}/%{name}-%{version}.tar.gz
+Patch0:    %{name}-soname.patch
+Patch1:    %{name}-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen
 BuildRequires: libtiff-devel libjpeg-devel proj-devel zlib-devel
@@ -19,10 +19,10 @@ to establish a TIFF based interchange format for georeferenced
 raster imagery.
 
 %package devel
-Summary: Development Libraries for the GeoTIFF file format library
+Summary: Development library and header for the GeoTIFF file format library
 Group: Development/Libraries
 Requires: pkgconfig libtiff-devel
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The GeoTIFF library provides support for development of geotiff image format.
@@ -74,10 +74,8 @@ sed -i 's|LD_SHARED=@LD_SHARED@|LD_SHARED=@CC@ -shared|' Makefile.in
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-# install libgeotiff
-make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 # install manualy some file
 install -p -m 755 bin/makegeo %{buildroot}%{_bindir}
@@ -107,32 +105,38 @@ echo  >> %{buildroot}%{_datadir}/epsg_csv/codes.csv
 doxygen
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files 
-%defattr(-,root,root,-)
 %doc ChangeLog LICENSE README
 %doc docs/*.txt docs/*.html
 %{_bindir}/geotifcp
 %{_bindir}/listgeo
 %{_bindir}/makegeo
-%{_libdir}/libgeotiff.so.*
+%{_libdir}/%{name}.so.*
 %dir %{_datadir}/epsg_csv
 %attr(0644,root,root) %{_datadir}/epsg_csv/*.csv
 
 %files devel
-%defattr(-,root,root,-)
 %doc docs/api
 %dir %{_includedir}/%{name}
 %attr(0644,root,root) %{_includedir}/%{name}/*.h
 %attr(0644,root,root) %{_includedir}/%{name}/*.inc
-%{_libdir}/libgeotiff.so
+%{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu May 10 2012 Volker Fröhlich <volker27@gmx.at> - 1.2.5-8
+- Add isa macro
+- Harmonize buildroot/RPM_BUILD_ROOT
+- Replace install macro, use name macro where suitable
+- Improve devel sub-package description
+- Remove defattr
+- Rebuild for libtiff 4
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild