trigger service run

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geotiff?expand=0&rev=12

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
+  * update to EPSG v8.9 database
-    * cleanups and security fixes
+  * cleanups and security fixes
 
 -------------------------------------------------------------------
 Fri Sep 30 21:00:00 UTC 2016 - tzotsos@opensuse.org

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:  pkgconfig
-BuildRequires:  libtiff-devel
+BuildRequires:  pkgconfig(libtiff-4)
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(proj)
-BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(zlib)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %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}
+Provides:       lib%{name}-devel = %{version}
-Requires:       libproj-devel
+Requires:       %{libname} = %{version}
-Requires:       libtiff-devel
+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 <<EOF
@@ -110,24 +107,20 @@ exec_prefix=%{_prefix}
 libdir=%{_libdir}
 includedir=%{_includedir}/lib%{name}
 
-Name: %{libname}
+Name:           %{libname}
+Version:        %{version}
 Description: GeoTIFF file format library
-Version: %{version}
 Libs: -L%{_libdir} -llib%{name}
 Cflags: -I%{_includedir}/lib%{name}
 EOF
-
 install -dm 755 %{buildroot}%{_libdir}/pkgconfig
 install -p -m 644 lib%{name}.pc %{buildroot}%{_libdir}/pkgconfig
-
 echo  >> %{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
+%post -n %{libname} -p /sbin/ldconfig
-
+%postun -n %{libname} -p /sbin/ldconfig
-%postun -n lib%{name}2 -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%{ext_man}
-%{_mandir}/man1/listgeo.1.*
+%{_mandir}/man1/applygeo.1%{ext_man}
-%{_mandir}/man1/applygeo.1.*
+%{_mandir}/man1/geotifcp.1%{ext_man}
-%{_mandir}/man1/geotifcp.1.*
 %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}