- Fix incorrect library (boo#1094802)

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geotiff?expand=0&rev=18
This commit is contained in:
Martin Pluskal 2018-05-29 08:52:12 +00:00 committed by Git OBS Bridge
parent 4f511a9905
commit cd196feff2
2 changed files with 23 additions and 16 deletions

View File

@ -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 Sun Mar 12 12:42:35 UTC 2017 - mpluskal@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package geotiff # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,9 +22,9 @@ Name: geotiff
Version: 1.4.2 Version: 1.4.2
Release: 0 Release: 0
Summary: Library to handle georeferenced TIFF Summary: Library to handle georeferenced TIFF
License: MIT and SUSE-Public-Domain License: MIT AND SUSE-Public-Domain
Group: Productivity/Scientific/Other 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 Source0: http://download.osgeo.org/%{name}/lib%{name}/lib%{name}-%{version}.tar.gz
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
@ -41,10 +41,10 @@ GeoTIFF keys in new files.
%package devel %package devel
Summary: GeoTIFF header files Summary: GeoTIFF header files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: lib%{name}-devel = %{version}
Requires: %{libname} = %{version} Requires: %{libname} = %{version}
Requires: pkgconfig(libtiff-4) Requires: pkgconfig(libtiff-4)
Requires: pkgconfig(proj) Requires: pkgconfig(proj)
Provides: lib%{name}-devel = %{version}
%description devel %description devel
Header files for GeoTIFF library. Header files for GeoTIFF library.
@ -110,40 +110,42 @@ includedir=%{_includedir}/lib%{name}
Name: %{libname} Name: %{libname}
Version: %{version} Version: %{version}
Description: GeoTIFF file format library Description: GeoTIFF file format library
Libs: -L%{_libdir} -llib%{name} Libs: -L%{_libdir} -l%{name}
Cflags: -I%{_includedir}/lib%{name} Cflags: -I%{_includedir}/lib%{name}
EOF 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 echo >> %{buildroot}%{_datadir}/epsg_csv/codes.csv
# do not ship la files # 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 %post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %license LICENSE COPYING
%doc ChangeLog LICENSE README COPYING %doc ChangeLog README
%{_bindir}/geotifcp %{_bindir}/geotifcp
%{_bindir}/listgeo %{_bindir}/listgeo
%{_bindir}/applygeo %{_bindir}/applygeo
%{_mandir}/man1/listgeo.1%{ext_man} %{_mandir}/man1/listgeo.1%{?ext_man}
%{_mandir}/man1/applygeo.1%{ext_man} %{_mandir}/man1/applygeo.1%{?ext_man}
%{_mandir}/man1/geotifcp.1%{ext_man} %{_mandir}/man1/geotifcp.1%{?ext_man}
%dir %{_datadir}/epsg_csv %dir %{_datadir}/epsg_csv
%attr(0755,root,root) %{_datadir}/epsg_csv/csv2c.py* %attr(0755,root,root) %{_datadir}/epsg_csv/csv2c.py*
%attr(0755,root,root) %{_datadir}/epsg_csv/csv_tools.py* %attr(0755,root,root) %{_datadir}/epsg_csv/csv_tools.py*
%attr(0644,root,root) %{_datadir}/epsg_csv/*.csv %attr(0644,root,root) %{_datadir}/epsg_csv/*.csv
%files -n %{libname} %files -n %{libname}
%defattr(-,root,root) %license LICENSE COPYING
%doc ChangeLog LICENSE README COPYING %doc ChangeLog README
%{_libdir}/lib%{name}.so.%{sover}* %{_libdir}/lib%{name}.so.%{sover}*
%files devel %files devel
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc ChangeLog LICENSE README COPYING %license LICENSE COPYING
%doc ChangeLog README
%dir %{_includedir}/lib%{name} %dir %{_includedir}/lib%{name}
%{_includedir}/lib%{name}/*.h %{_includedir}/lib%{name}/*.h
%{_includedir}/lib%{name}/*.inc %{_includedir}/lib%{name}/*.inc