summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-08-05 07:46:12 +0200
committerRemi Collet <remi@php.net>2022-08-05 07:46:12 +0200
commit69493f47a04f88abac7bcb74317fbc8f63942161 (patch)
tree20d1d200af744c8b56cce5884698f2f1ca39d769
parent7e7c495c1fd4e50b5b68e19cc4c990f7792c6698 (diff)
rebuildHEADmaster
-rw-r--r--php-maxminddb.spec20
1 files changed, 9 insertions, 11 deletions
diff --git a/php-maxminddb.spec b/php-maxminddb.spec
index e3985d1..d7a5ab8 100644
--- a/php-maxminddb.spec
+++ b/php-maxminddb.spec
@@ -1,21 +1,19 @@
# remirepo spec file for php-maxminddb
#
-# Copyright (c) 2018-2021 Remi Collet
+# Copyright (c) 2018-2022 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
%scl_package php-maxminddb
%global with_lib 0
%else
%global pkg_name %{name}
%global with_lib 1
%endif
-%global with_tests 0%{!?_without_tests:1}
-
+%bcond_without tests
%global gh_commit f7cc1a1472868f25a02636c99d1054232292bc26
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
@@ -30,10 +28,9 @@
%global pk_project reader
Summary: MaxMind DB Reader extension
-Name: %{?sub_prefix}php-maxminddb
+Name: %{?scl_prefix}php-maxminddb
Version: 1.11.0
-%global rpmrel 1
-Release: %{rpmrel}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: ASL 2.0
URL: https://github.com/%{gh_owner}/%{gh_project}
@@ -88,11 +85,10 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%if %{with_lib}
%package -n php-%{pk_vendor}-%{pk_project}
Summary: MaxMind DB Reader
-Release: %{rpmrel}%{?dist}
BuildArch: noarch
BuildRequires: php-fedora-autoloader-devel
-%if %{with_tests}
+%if %{with tests}
BuildRequires: php-bcmath
BuildRequires: php-gmp
# from composer.json "require-dev": {
@@ -252,7 +248,7 @@ REPORT_EXIT_STATUS=1 \
%{__ztsphp} -n run-tests.php --show-diff || ret=1
%endif
-%if %{with_lib} && %{with_tests}
+%if %{with_lib} && %{with tests}
cd ..
: Upstream test suite for the library
for cmd in php php72 php73 php74 php80 php81; do
@@ -317,9 +313,11 @@ fi
%endif
# when using pkgup, CHECK Release!
-# noarch in "remi" not in modular
%changelog
+* Fri Aug 5 2022 Remi Collet <remi@remirepo.net> - 1.11.0-2
+- rebuild
+
* Tue Oct 19 2021 Remi Collet <remi@remirepo.net> - 1.11.0-1
- update to 1.11.0