summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--curl.patch292
-rw-r--r--php-bartlett-php-compatinfo-db.spec9
2 files changed, 5 insertions, 296 deletions
diff --git a/curl.patch b/curl.patch
deleted file mode 100644
index 9688ee8..0000000
--- a/curl.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 41a60e07b6a9d9a77acdefd300bf0a11b698bc75 Mon Sep 17 00:00:00 2001
-From: Laurent Laville <laurent.laville@gmail.com>
-Date: Wed, 28 Sep 2016 20:25:28 +0200
-Subject: [PATCH] FIX lib_curl dependency on some constants
-
----
- data/references/Curl.constants.json | 62 ++++++++++++++++++-------------------
- 1 file changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/data/references/Curl.constants.json b/data/references/Curl.constants.json
-index d0838e0..7114a65 100644
---- a/data/references/Curl.constants.json
-+++ b/data/references/Curl.constants.json
-@@ -1230,7 +1230,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -1240,7 +1240,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -1250,7 +1250,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -1260,7 +1260,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -1888,7 +1888,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -2135,7 +2135,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -2145,7 +2145,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -2569,7 +2569,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -2579,7 +2579,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -2589,7 +2589,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -2599,7 +2599,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -2609,7 +2609,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -2619,7 +2619,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3241,7 +3241,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3251,7 +3251,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3281,7 +3281,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3291,7 +3291,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3361,7 +3361,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3391,7 +3391,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3401,7 +3401,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3765,7 +3765,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3775,7 +3775,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3785,7 +3785,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3795,7 +3795,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3805,7 +3805,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3815,7 +3815,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3825,7 +3825,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3835,7 +3835,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3845,7 +3845,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3855,7 +3855,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
-@@ -3865,7 +3865,7 @@
- "php_min": "5.5.0",
- "php_max": "",
- "php_excludes": "",
-- "lib_curl": "~7.19.6"
-+ "lib_curl": "~7.20"
- },
- {
- "ext_name_fk": 9,
diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index ac8d289..07da059 100644
--- a/php-bartlett-php-compatinfo-db.spec
+++ b/php-bartlett-php-compatinfo-db.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
# See https://github.com/llaville/php-compatinfo-db/releases
-%global gh_commit e4c2d0c5fe347e97fc864f01c9f2a33edd5df178
+%global gh_commit fc8e15c5c6bc31cfc1e99fbd523e721e66bd02be
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20151031
%global gh_owner llaville
@@ -23,7 +23,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{c_vendor}-%{c_project}
-Version: 1.12.0
+Version: 1.13.0
%global specrel 1
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Reference Database to be used with php-compatinfo library
@@ -40,7 +40,6 @@ Source1: %{name}-1.2.0-autoload.php
Patch0: %{name}-1.2.0-rpm.patch
# CURL_SSLVERSION constants have been backported
Patch1: %{name}-curltls.patch
-Patch2: curl.patch
BuildArch: noarch
# Needed to build the database from sources
@@ -106,7 +105,6 @@ Conflicts: php-bartlett-PHP-CompatInfo < 5
%patch0 -p1 -b .rpm
%patch1 -p0 -b .curltls
-%patch2 -p1 -b .curl
cp %{SOURCE1} src/%{ns_vendor}/%{ns_project}/autoload.php
@@ -186,6 +184,9 @@ export BARTLETT_COMPATINFO_DB=%{buildroot}%{_datadir}/%{name}/compatinfo.sqlite
%changelog
+* Tue Oct 4 2016 Remi Collet <remi@fedoraproject.org> - 1.13.0-1
+- update to 1.13.0
+
* Tue Sep 27 2016 Remi Collet <remi@fedoraproject.org> - 1.12.0-1
- update to 1.12.0
generated by cgit (git 2.34.1) at 2024-11-18 07:09:58 +0000