libgeotiff: Update to 1.5.1, clean up the rpmlint warnings, and also use more macros

This commit is contained in:
Devrim Gündüz 2019-09-04 14:26:09 +01:00
parent 3bc1e32804
commit 180e684ce2
3 changed files with 29 additions and 31 deletions

4
.gitignore vendored
View File

@ -1,3 +1 @@
libgeotiff-1.2.5.tar.gz /libgeotiff-1.5.1.tar.gz
/libgeotiff-1.4.0.tar.gz
/libgeotiff-1.4.3.tar.gz

View File

@ -1,12 +1,12 @@
Name: libgeotiff Name: libgeotiff
Version: 1.4.3 Version: 1.5.1
Release: 4%{?dist} Release: 1%{?dist}
Summary: GeoTIFF format library Summary: GeoTIFF format library
License: MIT License: MIT
URL: http://trac.osgeo.org/geotiff/ URL: http://trac.osgeo.org/geotiff/
Source: http://download.osgeo.org/geotiff/%{name}/%{name}-%{version}.tar.gz Source: http://download.osgeo.org/geotiff/%{name}/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libtiff-devel libjpeg-devel proj-devel >= 5.2.0 zlib-devel BuildRequires: libtiff-devel libjpeg-devel proj-devel >= 6.2.0 zlib-devel
%description %description
GeoTIFF represents an effort by over 160 different remote sensing, GeoTIFF represents an effort by over 160 different remote sensing,
@ -15,9 +15,9 @@ to establish a TIFF based interchange format for georeferenced
raster imagery. raster imagery.
%package devel %package devel
Summary: Development library and header for the GeoTIFF file format library Summary: Development library and header for the GeoTIFF file format library
Requires: pkgconfig libtiff-devel Requires: pkgconfig libtiff-devel
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
The GeoTIFF library provides support for development of geotiff image format. The GeoTIFF library provides support for development of geotiff image format.
@ -27,12 +27,12 @@ The GeoTIFF library provides support for development of geotiff image format.
%build %build
%configure \ %configure \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--includedir=%{_includedir}/%{name}/ \ --includedir=%{_includedir}/%{name}/ \
--with-proj \ --with-proj \
--with-jpeg \ --with-jpeg \
--with-zip \ --with-zip \
--disable-static --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@ -40,7 +40,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_build %{?_smp_mflags} %make_build %{?_smp_mflags}
%install %install
make install DESTDIR=%{buildroot} INSTALL="install -p" %{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
# install pkgconfig file # install pkgconfig file
cat > %{name}.pc <<EOF cat > %{name}.pc <<EOF
@ -56,12 +56,11 @@ Libs: -L\${libdir} -lgeotiff
Cflags: -I\${includedir} Cflags: -I\${includedir}
EOF EOF
mkdir -p %{buildroot}%{_libdir}/pkgconfig/ %{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig/
install -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/ %{__install} -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/
#clean up junks #clean up junks
rm -fv %{buildroot}%{_libdir}/lib*.la %{__rm} -fv %{buildroot}%{_libdir}/lib*.la
echo >> %{buildroot}%{_datadir}/epsg_csv/codes.csv
%files %files
%license LICENSE %license LICENSE
@ -69,18 +68,19 @@ echo >> %{buildroot}%{_datadir}/epsg_csv/codes.csv
%{_bindir}/applygeo %{_bindir}/applygeo
%{_bindir}/geotifcp %{_bindir}/geotifcp
%{_bindir}/listgeo %{_bindir}/listgeo
%{_libdir}/%{name}.so.2* %{_libdir}/%{name}.so.5*
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%dir %{_datadir}/epsg_csv
%{_datadir}/epsg_csv/*.csv
%files devel %files devel
%{_includedir}/%{name} %{_includedir}/%{name}
%{_libdir}/%{name}.so %{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/epsg_csv/*.py
%changelog %changelog
%changelog
* Wed Sep 4 2019 Devrim Gündüz <devrim@gunduz.org> - 1.5.1-1
- Update to 1.5.1
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-4 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (libgeotiff-1.4.3.tar.gz) = 0d0db959a55135ad6989b6dab37e0da83b33ab57a7e92d45d459d954c3ece452dfa1202033f048d94d13d0c09a3d397aa138d9b0ff949d11e0740f6188f011b5 SHA512 (libgeotiff-1.5.1.tar.gz) = 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1