From cd196feff2e0372641d8bda4eb0f9ef2ca1d227be41e87578d12c84ce090bc7f Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 29 May 2018 08:52:12 +0000
Subject: [PATCH] - Fix incorrect library (boo#1094802)

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geotiff?expand=0&rev=18
---
 geotiff.changes |  5 +++++
 geotiff.spec    | 34 ++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/geotiff.changes b/geotiff.changes
index d7f01a2..4b418f5 100644
--- a/geotiff.changes
+++ b/geotiff.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 29 08:51:01 UTC 2018 - mpluskal@suse.com
+
+- Fix incorrect library (boo#1094802)
+
 -------------------------------------------------------------------
 Sun Mar 12 12:42:35 UTC 2017 - mpluskal@suse.com
 
diff --git a/geotiff.spec b/geotiff.spec
index cd3d4ff..13d9dcd 100644
--- a/geotiff.spec
+++ b/geotiff.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package geotiff
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,9 +22,9 @@ Name:           geotiff
 Version:        1.4.2
 Release:        0
 Summary:        Library to handle georeferenced TIFF
-License:        MIT and SUSE-Public-Domain
+License:        MIT AND SUSE-Public-Domain
 Group:          Productivity/Scientific/Other
-Url:            http://trac.osgeo.org/geotiff
+URL:            http://trac.osgeo.org/geotiff
 Source0:        http://download.osgeo.org/%{name}/lib%{name}/lib%{name}-%{version}.tar.gz
 BuildRequires:  gcc-c++
 BuildRequires:  libjpeg-devel
@@ -41,10 +41,10 @@ GeoTIFF keys in new files.
 %package devel
 Summary:        GeoTIFF header files
 Group:          Development/Libraries/C and C++
-Provides:       lib%{name}-devel = %{version}
 Requires:       %{libname} = %{version}
 Requires:       pkgconfig(libtiff-4)
 Requires:       pkgconfig(proj)
+Provides:       lib%{name}-devel = %{version}
 
 %description devel
 Header files for GeoTIFF library.
@@ -110,40 +110,42 @@ includedir=%{_includedir}/lib%{name}
 Name:           %{libname}
 Version:        %{version}
 Description: GeoTIFF file format library
-Libs: -L%{_libdir} -llib%{name}
+Libs: -L%{_libdir} -l%{name}
 Cflags: -I%{_includedir}/lib%{name}
 EOF
-install -dm 755 %{buildroot}%{_libdir}/pkgconfig
-install -p -m 644 lib%{name}.pc %{buildroot}%{_libdir}/pkgconfig
+
+install -Dpm 0644 lib%{name}.pc \
+  %{buildroot}%{_libdir}/pkgconfig/lib%{name}.pc
 echo  >> %{buildroot}%{_datadir}/epsg_csv/codes.csv
 # do not ship la files
-find %{buildroot}%{_libdir} -name "*.la" -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog LICENSE README COPYING
+%license LICENSE COPYING
+%doc ChangeLog README
 %{_bindir}/geotifcp
 %{_bindir}/listgeo
 %{_bindir}/applygeo
-%{_mandir}/man1/listgeo.1%{ext_man}
-%{_mandir}/man1/applygeo.1%{ext_man}
-%{_mandir}/man1/geotifcp.1%{ext_man}
+%{_mandir}/man1/listgeo.1%{?ext_man}
+%{_mandir}/man1/applygeo.1%{?ext_man}
+%{_mandir}/man1/geotifcp.1%{?ext_man}
 %dir %{_datadir}/epsg_csv
 %attr(0755,root,root) %{_datadir}/epsg_csv/csv2c.py*
 %attr(0755,root,root) %{_datadir}/epsg_csv/csv_tools.py*
 %attr(0644,root,root) %{_datadir}/epsg_csv/*.csv
 
 %files -n %{libname}
-%defattr(-,root,root)
-%doc ChangeLog LICENSE README COPYING
+%license LICENSE COPYING
+%doc ChangeLog README
 %{_libdir}/lib%{name}.so.%{sover}*
 
 %files devel
 %defattr(0644,root,root,0755)
-%doc ChangeLog LICENSE README COPYING
+%license LICENSE COPYING
+%doc ChangeLog README
 %dir %{_includedir}/lib%{name}
 %{_includedir}/lib%{name}/*.h
 %{_includedir}/lib%{name}/*.inc