Update to 7.2.2

This commit is contained in:
Julien Enselme 2019-02-24 10:07:16 +01:00
parent 9ab2bb65c0
commit b18b04cbb8
3 changed files with 25 additions and 16 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/mapserver-0f9ece882a48a286f933a17aa40880073df93aac.tar.gz
/mapserver-b4bc015a9fcbb9a42d1922733a03a76311f622b6.tar.gz
/mapserver-208bb3a10fccdc9c1bdab175915072270abb1b45.tar.gz
/mapserver-d5c22cd3113ba85f5b1f1c406fe4055f75d04ce3.tar.gz

View File

@ -4,15 +4,16 @@
# MapServer doesn't support PHP 7 yet. See:
# https://github.com/mapserver/mapserver/issues/5252
%global php_mapscript 0
# MapServer doesn't support Python 3 yet. See:
# https://github.com/mapserver/mapserver/issues/4748
# MapServer should support Python 3 but still builds with Python 2.
# This should be investigated.
%global python_mapscript 0
%global commit 208bb3a10fccdc9c1bdab175915072270abb1b45
%global commit 7fe9b2b9f74796731cba2f7f09c8f41875f020e4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: mapserver
Version: 7.0.5
Release: 16.git%{shortcommit}%{?dist}
Version: 7.2.2
Release: 1.git%{shortcommit}%{?dist}
Summary: Environment for building spatially-enabled internet applications
License: BSD
@ -23,6 +24,7 @@ Source0: https://github.com/%{project_owner}/%{project_name}/archive/%{co
Requires: httpd
Requires: dejavu-sans-fonts
BuildRequires: autoconf
BuildRequires: gcc-c++
BuildRequires: cairo-devel
BuildRequires: cmake
@ -48,6 +50,7 @@ BuildRequires: pam-devel
BuildRequires: perl-devel
BuildRequires: perl-generators
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: protobuf-c-devel
BuildRequires: libpq-devel
BuildRequires: proj-devel => 5.2.0
BuildRequires: readline-devel
@ -100,17 +103,18 @@ The Perl/Mapscript extension provides full map customization capabilities
within the Perl programming language.
%if 0%{python_mapscript}
%package -n python2-mapserver
%{?python_provide:%python_provide python2-mapserver}
%package -n python3-mapserver
%{?python_provide:%python_provide python3-mapserver}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
Summary: Python/Mapscript map making extensions to Python
BuildRequires: python2-devel
BuildRequires: python3-devel
Requires: %{name} = %{version}-%{release}
Requires: python3
%description -n python2-mapserver
%description -n python3-mapserver
The Python/Mapscript extension provides full map customization capabilities
within the Python programming language.
%endif # end python_mapscript
@ -212,6 +216,7 @@ cmake -DINSTALL_LIB_DIR=%{_libdir} \
-DWITH_SDE=FALSE \
-DWITH_SDE_PLUGIN=FALSE \
-DWITH_EXEMPI=FALSE \
-Wno-dev \
..
@ -255,7 +260,7 @@ EOF
%files
%doc README
%doc README.rst
%{_bindir}/legend
%{_bindir}/mapserv
%{_bindir}/msencrypt
@ -269,12 +274,12 @@ EOF
%{_datadir}/%{name}/
%files libs
%doc README
%doc README.rst
%{_libdir}/libmapserver.so.%{version}
%{_libdir}/libmapserver.so.2
%files devel
%doc README
%doc README.rst
%{_libdir}/libmapserver.so
%{_includedir}/%{name}/
@ -287,18 +292,18 @@ EOF
%endif # end php_mapscript
%files perl
%doc README
%doc README.rst
%doc mapscript/perl/examples
%dir %{perl_vendorarch}/auto/mapscript
%{perl_vendorarch}/auto/mapscript/*
%{perl_vendorarch}/mapscript.pm
%if 0%{python_mapscript}
%files -n python2-mapserver
%files -n python3-mapserver
%doc mapscript/python/README
%doc mapscript/python/examples
%doc mapscript/python/tests
%{python2_sitearch}/*mapscript*
%{python3_sitearch}/*mapscript*
%endif # end python_mapscript
%files java
@ -315,6 +320,9 @@ EOF
%changelog
* Sun Feb 24 2019 Julien Enselme <jujens@jujens.eu> - 7.2.2-1.git7fe9b2b
- Update to 7.2.2
* Mon Feb 04 2019 Devrim Gündüs <devrim@gunduz.org> - 7.0.5-16.git208bb3a
- Rebuild for new GeOS and Proj

View File

@ -1 +1 @@
SHA512 (mapserver-208bb3a10fccdc9c1bdab175915072270abb1b45.tar.gz) = 83ee2bbac2457c292494058cf1b1913c310bded2aaecefdab5a7bc12285accd602d55967cee89b0dd3bf7340ee6e8e064e5df042ca673b11a4d98f84e7cfcd6e
SHA512 (mapserver-d5c22cd3113ba85f5b1f1c406fe4055f75d04ce3.tar.gz) = 59b7a6b69120ee9ce80d7dee1324d2c28616f3bf0b7afb7aaf94c6f090c09fc85a507f2140082f28e27493438ce8b068d55ebcdb0fce7ee2557d5aee7139d8c7