Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Remi Collet
aef042eaa2 v1.6.0
(cherry picked from commit 714e078cfc)
2019-12-20 15:14:30 +01:00
Remi Collet
1ee0cbb54e v1.5.1
(cherry picked from commit cfa6bb410b)
2019-12-13 09:18:08 +01:00
3 changed files with 15 additions and 3 deletions

3
.gitignore vendored
View file

@ -1,3 +1,6 @@
clog
/php-maxminddb-1.4.0-2f1086e.tgz /php-maxminddb-1.4.0-2f1086e.tgz
/php-maxminddb-1.4.1-eb83d0e.tgz /php-maxminddb-1.4.1-eb83d0e.tgz
/php-maxminddb-1.5.0-bd43609.tgz /php-maxminddb-1.5.0-bd43609.tgz
/php-maxminddb-1.5.1-f096bbe.tgz
/php-maxminddb-1.6.0-febd492.tgz

View file

@ -9,7 +9,7 @@
# #
# Please, preserve the changelog entries # Please, preserve the changelog entries
# #
%global gh_commit bd436094fc0a9b0558a899fb80b0ae34fe1808a0 %global gh_commit febd4920bf17c1da84cef58e56a8227dfb37fbe4
%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner maxmind %global gh_owner maxmind
%global gh_project MaxMind-DB-Reader-php %global gh_project MaxMind-DB-Reader-php
@ -24,7 +24,7 @@
Summary: MaxMind DB Reader extension Summary: MaxMind DB Reader extension
Name: php-maxminddb Name: php-maxminddb
Version: 1.5.0 Version: 1.6.0
Release: 1%{?dist} Release: 1%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/%{gh_owner}/%{gh_project} URL: https://github.com/%{gh_owner}/%{gh_project}
@ -79,6 +79,9 @@ Requires: php(language) >= 5.6
Recommends: php-bcmath Recommends: php-bcmath
Recommends: php-gmp Recommends: php-gmp
Recommends: php-maxminddb Recommends: php-maxminddb
# from composer.json "conflict": {
# "ext-maxminddb": "<1.6.0,>=2.0.0"
Conflicts: php-maxminddb < %{version}
# Weak dependencies on databases # Weak dependencies on databases
Recommends: geolite2-country Recommends: geolite2-country
Suggests: geolite2-city Suggests: geolite2-city
@ -245,6 +248,12 @@ exit $ret
%changelog %changelog
* Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 1.6.0-1
- update to 1.6.0
* Fri Dec 13 2019 Remi Collet <remi@remirepo.net> - 1.5.1-1
- update to 1.5.1
* Tue Oct 1 2019 Remi Collet <remi@remirepo.net> - 1.5.0-1 * Tue Oct 1 2019 Remi Collet <remi@remirepo.net> - 1.5.0-1
- update to 1.5.0 - update to 1.5.0
- raise dependency on PHP 5.6 - raise dependency on PHP 5.6

View file

@ -1 +1 @@
SHA512 (php-maxminddb-1.5.0-bd43609.tgz) = 8bf1b9e07fab0ce87acde34cf3f5e0b2958fc1f54eb938b7abaa1941712889f678a4b4ddfb9bcb41e6594f8c67e97fbf5209eb89f50f11f0cfab101b0ae7035c SHA512 (php-maxminddb-1.6.0-febd492.tgz) = 0ce09d1cf08f9c7adbdea9775f7dcc8e4142350fa9b93be355c2b18636b729c112ca5dcdb07fcb7596ce5003d1f03480c10cf120d8bb59985e6bca9158d44f8f