diff --git a/.gitignore b/.gitignore index e2fa7dc..ddfb1df 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ shapelib-1.3.0b2.tar.gz /shapelib-1.4.0RC1.tar.gz /shapelib-1.4.0.tar.gz /shapelib-1.4.1.tar.gz +/shapelib-man.tar.gz diff --git a/shapelib.spec b/shapelib.spec index a58be6d..346bbbf 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,7 +2,7 @@ Name: shapelib Version: 1.4.1 -Release: 4%{?pre:.%pre}%{?dist} +Release: 5%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -11,11 +11,20 @@ Summary: C library for handling ESRI Shapefiles # - contrib/dbfcat.c: Public domain License: (LGPLv2+ or MIT) and GPLv2+ and Public Domain URL: http://shapelib.maptools.org/ -Source: http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre}.tar.gz - +Source0: http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre}.tar.gz +# Man pages from debian package +# wget https://salsa.debian.org/debian-gis-team/shapelib/-/archive/master/shapelib-master.tar.gz +# tar --strip-components=2 -xvf shapelib-master.tar.gz shapelib-master/debian/man +# tar -czf shapelib-man.tar.gz man/ +# rm -r man +Source1: %{name}-man.tar.gz + +BuildRequires: automake autoconf libtool BuildRequires: gcc-c++ BuildRequires: make BuildRequires: proj-devel >= 4.4.1 +# For man pages +BuildRequires: rubygem-ronn %description The Shapefile C Library provides the ability to write @@ -41,10 +50,13 @@ This package contains various utility programs distributed with shapelib. %prep -%autosetup +%autosetup -a1 %build +# Kill rpath +autoreconf -ifv + %configure --disable-static %make_build @@ -55,6 +67,10 @@ This package contains various utility programs distributed with shapelib. # Remove static libraries find %{buildroot} -name '*.la' -exec rm -f {} ';' +# Build man pages +ronn -r --date="$(LC_ALL=C date -u "+%Y-%m-%d")" --manual=%{name} man/*.md +mkdir -p %{buildroot}%{_mandir}/man1/ +install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %post -p /sbin/ldconfig @@ -74,9 +90,13 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %files tools %doc contrib/doc/ %{_bindir}/* +%{_mandir}/man1/*.1* %changelog +* Mon Aug 20 2018 Sandro Mani - 1.4.1-5 +- Add man pages (#1619071) + * Sat Jul 14 2018 Fedora Release Engineering - 1.4.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index daeefa0..1a3558f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (shapelib-1.4.1.tar.gz) = 791c1a0d6c5ff09341176f68349ebd760ae91e8749a9f844299d7ac38a42c4f1131e63479c384a8a8b05a89e90d02e9fd92c526cab417eb80b171d639b4a4422 +SHA512 (shapelib-man.tar.gz) = 22bbb3d7a2ad2789502297b028f793ff9fb28ce510537f58ba4f82b6c125f38bdbedf6fabf5eaf7cf88f70fff6003eb7ece494ab72ac727393e158950de56edb