From 73a2a9056af7a0f65138fb40b0dacf8c0db6dba02bddef0d2f5976fdc0543197 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 13 Mar 2017 09:21:47 +0000 Subject: [PATCH] trigger service run OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geotiff?expand=0&rev=12 --- geotiff.changes | 9 ++++++-- geotiff.spec | 60 +++++++++++++++++++++---------------------------- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/geotiff.changes b/geotiff.changes index 0f3a790..0c243c1 100644 --- a/geotiff.changes +++ b/geotiff.changes @@ -1,9 +1,14 @@ +------------------------------------------------------------------- +Sun Mar 12 12:42:35 UTC 2017 - mpluskal@suse.com + +- Small packaging cleanup + ------------------------------------------------------------------- Sat Oct 1 09:00:00 UTC 2016 - tzotsos@opensuse.org - Update to 1.4.2 - * update to EPSG v8.9 database - * cleanups and security fixes + * update to EPSG v8.9 database + * cleanups and security fixes ------------------------------------------------------------------- Fri Sep 30 21:00:00 UTC 2016 - tzotsos@opensuse.org diff --git a/geotiff.spec b/geotiff.spec index 55c1de6..cd3d4ff 100644 --- a/geotiff.spec +++ b/geotiff.spec @@ -1,7 +1,7 @@ # # spec file for package geotiff # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -16,6 +16,8 @@ # +%define sover 2 +%define libname lib%{name}%{sover} Name: geotiff Version: 1.4.2 Release: 0 @@ -24,41 +26,38 @@ License: MIT and SUSE-Public-Domain Group: Productivity/Scientific/Other Url: http://trac.osgeo.org/geotiff Source0: http://download.osgeo.org/%{name}/lib%{name}/lib%{name}-%{version}.tar.gz -BuildRequires: doxygen BuildRequires: gcc-c++ -BuildRequires: graphviz BuildRequires: libjpeg-devel -BuildRequires: libproj-devel -BuildRequires: libtiff-devel -BuildRequires: pkg-config -BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(proj) +BuildRequires: pkgconfig(zlib) %description This library is designed to permit the extraction and parsing of the "GeoTIFF" Key directories, as well as definition and installation of GeoTIFF keys in new files. -%package -n lib%{name}-devel +%package devel Summary: GeoTIFF header files Group: Development/Libraries/C and C++ -Requires: lib%{name}2 = %{version} -Requires: libproj-devel -Requires: libtiff-devel +Provides: lib%{name}-devel = %{version} +Requires: %{libname} = %{version} +Requires: pkgconfig(libtiff-4) +Requires: pkgconfig(proj) -%description -n lib%{name}-devel +%description devel Header files for GeoTIFF library. This library is designed to permit the extraction and parsing of the "GeoTIFF" Key directories, as well as definition and installation of GeoTIFF keys in new files. -%package -n lib%{name}2 +%package -n %{libname} Summary: Shared libraries for GeoTIFF library Group: System/Libraries -Provides: lib%{name} -%description -n lib%{name}2 +%description -n %{libname} Shared libraries for GeoTIFF library. This library is designed to permit the extraction and parsing of the @@ -87,7 +86,6 @@ done %build export CFLAGS="%{optflags} $CFLAGS -g -fstack-protector -fno-strict-aliasing -D _BSD_SOURCE" export CXXFLAGS="%{optflags} $CXXFLAGS -g -fstack-protector -fno-strict-aliasing" - %configure \ --prefix=%{_prefix} \ --includedir=%{_includedir}/lib%{name} \ @@ -97,11 +95,10 @@ export CXXFLAGS="%{optflags} $CXXFLAGS -g -fstack-protector -fno-strict-aliasing --with-pic \ --enable-static=no \ --enable-debug=yes - make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} INSTALL="install -p" +%make_install # install pkgconfig file cat > libgeotiff.pc <> %{buildroot}%{_datadir}/epsg_csv/codes.csv - # do not ship la files find %{buildroot}%{_libdir} -name "*.la" -delete -print -%post -n lib%{name}2 -p /sbin/ldconfig - -%postun -n lib%{name}2 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -135,21 +128,20 @@ find %{buildroot}%{_libdir} -name "*.la" -delete -print %{_bindir}/geotifcp %{_bindir}/listgeo %{_bindir}/applygeo -#%{_bindir}/makegeo -%{_mandir}/man1/listgeo.1.* -%{_mandir}/man1/applygeo.1.* -%{_mandir}/man1/geotifcp.1.* +%{_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 lib%{name}2 +%files -n %{libname} %defattr(-,root,root) %doc ChangeLog LICENSE README COPYING -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.%{sover}* -%files -n lib%{name}-devel +%files devel %defattr(0644,root,root,0755) %doc ChangeLog LICENSE README COPYING %dir %{_includedir}/lib%{name}