public/rpms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Gdal and proj have now different names

Browse Source
This commit is contained in:
dani
2020-01-11 08:15:44 +01:00
parent 656acc67d7
commit 80768a729e
2 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fedora/SPECS/gdal.spec
View File

@@ -1,6 +1,7 @@
%define bashcompletiondir %{_sysconfdir}/bash_completion.d
%define realname gdal
Name: gdal
Name: gdal3
Version: 3.0.2
Release: 2%{?dist}
#define debug_package #{nil}
@@ -8,7 +9,7 @@ License: MIT
Group: Applications/System
Summary: GIS file format library
URL: http://www.gdal.org
Source0: %name-%{version}.tar.gz
Source0: %realname-%{version}.tar.gz
BuildRequires: freexl-devel
@@ -72,7 +73,7 @@ This package contains the GDAL file format library.
simple service for looking up your IP address. This is the code that powers https://echoip.daniel-steiner.org.
%prep
%setup -q -n %{name}-%{version}
%setup -q -n %{realname}-%{version}
%build
./configure \
@@ -143,7 +144,7 @@ mv %{buildroot}%{_prefix}/etc %{buildroot}/
%{_libdir}/libgdal.so.26.*
%{_datadir}/%{name}/*
#TODO: Possibly remove files like .dxf, .dgn, ...
%dir %{_libdir}/%{name}plugins
%dir %{_libdir}/%{realname}plugins
%files devel
%{_bindir}/%{name}-config
@@ -151,7 +152,7 @@ mv %{buildroot}%{_prefix}/etc %{buildroot}/
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/%{realname}.pc
%changelog
* Wed Jan 8 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>

40
fedora/SPECS/proj.spec
View File

@@ -1,15 +1,15 @@
%global proj_version 6.3.0
%global datumgrid_version 1.8
%define realname proj
Name: proj
Name: proj6
Version: %{proj_version}
Release: 1%{?dist}
Summary: Cartographic projection software (PROJ.4)
License: MIT
URL: https://proj4.org
Source0: https://download.osgeo.org/%{name}/%{name}-%{version}.tar.gz
Source1: https://download.osgeo.org/%{name}/%{name}-datumgrid-%{datumgrid_version}.tar.gz
Source0: https://download.osgeo.org/%{realname}/%{realname}-%{version}.tar.gz
BuildRequires: libtool gcc-c++
@@ -21,7 +21,7 @@ projection functions.
%package devel
Summary: Development files for PROJ.4
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{realname}%{?_isa} = %{version}-%{release}
%description devel
This package contains libproj and the appropriate header files and man pages.
@@ -29,41 +29,22 @@ This package contains libproj and the appropriate header files and man pages.
%package static
Summary: Development files for PROJ.4
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: %{realname}-devel%{?_isa} = %{version}-%{release}
%description static
This package contains libproj static library.
%package datumgrid
Summary: Additional datum shift grids for PROJ.4
Version: %{datumgrid_version}
Release: 99%{?dist}
# See README.DATUMGRID
License: CC-BY and Freely Distributable and Ouverte and Public Domain
BuildArch: noarch
# Renamed; remove after Fedora 31.
Obsoletes: proj-nad < 5.2.0-2
Provides: proj-nad = %{proj_version}-%{release}
%description datumgrid
This package contains additional datum shift grids.
%prep
%autosetup
# Prepare datumgrid and file list (in {datadir}/proj and README marked as doc)
mkdir nad
tar xvf %{SOURCE1} -C nad | \
sed -e 's!^!%{_datadir}/%{name}/!' -e '/README/s!^!%%doc !' > datumgrid.files
%build
# rebuild due to patch
autoreconf -i
%configure
%configure \
--includedir=%{_includedir}/%{name} \
--datarootdir=%{_datadir}/%{name}
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
%make_build
@@ -135,9 +116,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
%{_libdir}/libproj.a
%{_libdir}/libproj.la
%files datumgrid -f datumgrid.files
%dir %{_datadir}/%{name}
%changelog
* Mon Jan 6 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>