From 2a6014726b78c5a39e94c1afd3e22d9314bb0a66 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 21 Jan 2019 17:19:05 +0100
Subject: v2.0.0

---
 accda679038e2e4239229521f643758b02557105.patch | 50 --------------------------
 php-bartlett-php-compatinfo-db.spec            | 12 +++----
 2 files changed, 6 insertions(+), 56 deletions(-)
 delete mode 100644 accda679038e2e4239229521f643758b02557105.patch

diff --git a/accda679038e2e4239229521f643758b02557105.patch b/accda679038e2e4239229521f643758b02557105.patch
deleted file mode 100644
index b66081f..0000000
--- a/accda679038e2e4239229521f643758b02557105.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From accda679038e2e4239229521f643758b02557105 Mon Sep 17 00:00:00 2001
-From: Laurent Laville <laurent.laville@gmail.com>
-Date: Wed, 2 Jan 2019 22:41:27 +0100
-Subject: [PATCH] update Amqp ref to version 1.9.4 (stable)
-
----
- CHANGELOG.md                         | 1 +
- data/references/Amqp.iniEntries.json | 8 ++++++++
- data/references/Amqp.releases.json   | 9 +++++++++
- 3 files changed, 18 insertions(+)
-
-diff --git a/data/references/Amqp.iniEntries.json b/data/references/Amqp.iniEntries.json
-index 192a8a3..c9a2113 100644
---- a/data/references/Amqp.iniEntries.json
-+++ b/data/references/Amqp.iniEntries.json
-@@ -142,5 +142,13 @@
-         "ext_max": "",
-         "php_min": "5.3.0",
-         "php_max": ""
-+    },
-+    {
-+        "ext_name_fk": 1,
-+        "name": "amqp.sasl_method",
-+        "ext_min": "1.9.4",
-+        "ext_max": "",
-+        "php_min": "5.3.0",
-+        "php_max": ""
-     }
- ]
-\ No newline at end of file
-diff --git a/data/references/Amqp.releases.json b/data/references/Amqp.releases.json
-index da7c9cc..b6438ba 100644
---- a/data/references/Amqp.releases.json
-+++ b/data/references/Amqp.releases.json
-@@ -358,5 +358,14 @@
-         "ext_max": "",
-         "php_min": "5.3.0",
-         "php_max": ""
-+    },
-+    {
-+        "ext_name_fk": 1,
-+        "rel_version": "1.9.4",
-+        "rel_date": "2019-01-02",
-+        "rel_state": "stable",
-+        "ext_max": "",
-+        "php_min": "5.3.0",
-+        "php_max": ""
-     }
- ]
-\ No newline at end of file
diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index 5a9cb4a..35aac98 100644
--- a/php-bartlett-php-compatinfo-db.spec
+++ b/php-bartlett-php-compatinfo-db.spec
@@ -1,19 +1,19 @@
 # remirepo/fedora spec file for php-bartlett-php-compatinfo-db
 #
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 # See https://github.com/llaville/php-compatinfo-db/releases
-%global gh_commit    85d25a5c230cc2285b8a548021ff6b5ae28e985e
+%global gh_commit    a95fad981d14265644360d579f0f6741969dbec9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20151031
 %global gh_owner     llaville
 %global gh_project   php-compatinfo-db
 %global upstream_version  2.0.0
-%global upstream_prever   RC1
+#global upstream_prever   RC1
 # Namespace
 %global ns_vendor    Bartlett
 %global ns_project   CompatInfoDb
@@ -43,8 +43,6 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 Patch0:         %{name}-2.0-rpm.patch
 # CURL_SSLVERSION constants have been backported
 Patch1:         %{name}-curltls.patch
-# Upstream
-Patch2:         https://github.com/llaville/php-compatinfo-db/commit/accda679038e2e4239229521f643758b02557105.patch
 
 BuildArch:      noarch
 # Needed to build the database from sources
@@ -149,7 +147,6 @@ Conflicts:      php-bartlett-PHP-CompatInfo < 5
 
 %patch0 -p1 -b .rpm
 %patch1 -p0 -b .curltls
-%patch2 -p1 -b .up
 
 cat << 'EOF' | tee src/autoload.php
 <?php
@@ -270,6 +267,9 @@ EOF
 
 
 %changelog
+* Mon Jan 21 2019 Remi Collet <remi@remirepo.net> - 2.0.0-1
+- update to 2.0.0
+
 * Thu Jan  3 2019 Remi Collet <remi@remirepo.net> - 2.0.0~RC1-1
 - update to 2.0.0RC1
 - bump dependency on PHP 7.1
-- 
cgit