From ec78bf01b8cc51aba90b0890e4f22a182f9c778f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Mar 2023 15:20:58 +0200 Subject: use SPDX license ID --- php-geos.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/php-geos.spec b/php-geos.spec index db30d68..441bd04 100644 --- a/php-geos.spec +++ b/php-geos.spec @@ -1,7 +1,7 @@ # remirepo spec file for php-geos # -# Copyright (c) 2016-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2016-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -31,7 +31,7 @@ Summary: PHP module for GEOS Group: Development/Languages # See COPYING -License: LGPLv2+ and MIT +License: LGPL-2.1-or-later AND MIT URL: http://trac.osgeo.org/geos Source0: https://git.osgeo.org/gogs/geos/php-geos/archive/%{version}%{?prever}.tar.gz @@ -74,12 +74,12 @@ mv %{pkg_name} NTS cd NTS chmod -x *.c -%patch0 -p1 -b .test -%patch1 -p1 -b .wformat -%patch2 -p1 -b .arginfo -%patch3 -p1 -b .zendlong -%patch4 -p1 -b .arg -%patch5 -p1 -b .php82 +%patch -P0 -p1 -b .test +%patch -P1 -p1 -b .wformat +%patch -P2 -p1 -b .arginfo +%patch -P3 -p1 -b .zendlong +%patch -P4 -p1 -b .arg +%patch -P5 -p1 -b .php82 sed -e '/PHP_GEOS_VERSION/s/"0.0"/"%{version}%{?prever}"/' -i php_geos.h @@ -190,6 +190,9 @@ exit $ret %changelog +* Fri Mar 31 2023 Remi Collet - 1.0.0-27 +- use SPDX license ID + * Fri Sep 9 2022 Remi Collet - 1.0.0-24 - add patch for PHP 8.2 from https://git.osgeo.org/gitea/geos/php-geos/issues/27 -- cgit