update to 1.3.0RC1

raise dependency on libbson and mongo-c-driver 1.8.0
raise dependency on PHP 5.5

3 files changed, 22 insertions, 91 deletions

diff --git a/REFLECTION b/REFLECTION
index 98a72d5..a738a57 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #175 mongodb version 1.3.0beta1 ] {
+Extension [ <persistent> extension #177 mongodb version 1.3.0RC1 ] {
 
   - Dependencies {
     Dependency [ date (Required) ]
@@ -14,7 +14,7 @@ Extension [ <persistent> extension #175 mongodb version 1.3.0beta1 ] {
   }
 
   - Constants [2] {
-    Constant [ string MONGODB_VERSION ] { 1.3.0beta1 }
+    Constant [ string MONGODB_VERSION ] { 1.3.0RC1 }
     Constant [ string MONGODB_STABILITY ] { beta }
   }
 
@@ -70,7 +70,7 @@ Extension [ <persistent> extension #175 mongodb version 1.3.0beta1 ] {
     }
   }
 
-  - Classes [53] {
+  - Classes [52] {
     Interface [ <internal:mongodb> interface MongoDB\BSON\Type ] {
 
       - Constants [0] {
@@ -265,7 +265,7 @@ Extension [ <persistent> extension #175 mongodb version 1.3.0beta1 ] {
       }
     }
 
-    Interface [ <internal:mongodb> interface MongoDB\BSON\ObjectIDInterface ] {
+    Interface [ <internal:mongodb> interface MongoDB\BSON\ObjectIdInterface ] {
 
       - Constants [0] {
       }
@@ -675,7 +675,7 @@ Extension [ <persistent> extension #175 mongodb version 1.3.0beta1 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\ObjectID implements MongoDB\BSON\ObjectIDInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\ObjectId implements MongoDB\BSON\ObjectIdInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
 
       - Constants [0] {
       }
@@ -703,13 +703,13 @@ Extension [ <persistent> extension #175 mongodb version 1.3.0beta1 ] {
           }
         }
 
-        Method [ <internal:mongodb, prototype MongoDB\BSON\ObjectIDInterface> final public method getTimestamp ] {
+        Method [ <internal:mongodb, prototype MongoDB\BSON\ObjectIdInterface> final public method getTimestamp ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:mongodb, prototype MongoDB\BSON\ObjectIDInterface> final public method __toString ] {
+        Method [ <internal:mongodb, prototype MongoDB\BSON\ObjectIdInterface> final public method __toString ] {
 
           - Parameters [0] {
           }
@@ -902,35 +902,6 @@ Extension [ <persistent> extension #175 mongodb version 1.3.0beta1 ] {
       }
     }
 
-    Interface [ <internal:mongodb> interface MongoDB\BSON\TypeWrapper ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [1] {
-        Method [ <internal:mongodb> abstract static public method createFromBSONType ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> MongoDB\BSON\Type $type ]
-          }
-        }
-      }
-
-      - Properties [0] {
-      }
-
-      - Methods [1] {
-        Method [ <internal:mongodb> abstract public method toBSONType ] {
-
-          - Parameters [0] {
-          }
-        }
-      }
-    }
-
     Class [ <internal:mongodb> final class MongoDB\BSON\UTCDateTime implements MongoDB\BSON\UTCDateTimeInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
 
       - Constants [0] {
diff --git a/mongodb-pr633.patch b/mongodb-pr633.patch
deleted file mode 100644
index 61d019c..0000000
--- a/mongodb-pr633.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Adapted from
-
-From ec7463a77b643f533b19079147a952a0d2dd21e3 Mon Sep 17 00:00:00 2001
-From: Derick Rethans <github@derickrethans.nl>
-Date: Wed, 16 Aug 2017 10:31:18 +0100
-Subject: [PATCH 1/2] PHPC-997: Handle changes in field names in timelib
- 2017.05beta7
-
----
- src/BSON/UTCDateTime.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c
-index 7f08285f..11055565 100644
---- a/src/BSON/UTCDateTime.c
-+++ b/src/BSON/UTCDateTime.c
-@@ -128,7 +128,11 @@ static bool php_phongo_utcdatetime_init_
- 
- 	/* The following assignments use the same logic as date_format() in php_date.c */
- 	sec = datetime_obj->time->sse;
-+#if PHP_VERSION_ID >= 70200
-+	usec = (int64_t) floor(datetime_obj->time->us);
-+#else
- 	usec = (int64_t) floor(datetime_obj->time->f * 1000000 + 0.5);
-+#endif
- 
- 	intern->milliseconds = (sec * 1000) + (usec / 1000);
- 	intern->initialized = true;
-@@ -256,7 +260,11 @@ static PHP_METHOD(UTCDateTime, toDateTim
- 	php_date_initialize(datetime_obj, sec, sec_len, NULL, NULL, 0 TSRMLS_CC);
- 	efree(sec);
- 
-+#if PHP_VERSION_ID >= 70200
-+	datetime_obj->time->us = (intern->milliseconds % 1000) * 1000;
-+#else
- 	datetime_obj->time->f = (double) (intern->milliseconds % 1000) / 1000;
-+#endif
- } /* }}} */
- 
- /* {{{ proto array MongoDB\BSON\UTCDateTime::jsonSerialize()
diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec
index 3903373..5df6060 100644
--- a/php-pecl-mongodb.spec
+++ b/php-pecl-mongodb.spec
@@ -31,7 +31,8 @@
 %global with_tests   0%{?_with_tests:1}
 %endif
 
-%if 0%{?fedora} >= 27
+%global libver 1.8.0
+%if 0%{?fedora} >= 99
 %global with_syslib 1
 %else
 %global with_syslib 0
@@ -40,28 +41,25 @@
 Summary:        MongoDB driver for PHP
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 %global upstream_version 1.3.0
-%global upstream_prever  beta1
-Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+%global upstream_prever  RC1
+Version:        %{upstream_version}~rc1
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        ASL 2.0
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-# https://github.com/mongodb/mongo-php-driver/pull/633
-Patch0:         %{pecl_name}-pr633.patch
-
-BuildRequires:  %{?scl_prefix}php-devel > 5.4
+BuildRequires:  %{?scl_prefix}php-devel > 5.5
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-json
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  openssl-devel
 %if %{with_syslib}
-BuildRequires:  pkgconfig(libbson-1.0)    >= 1.7
-BuildRequires:  pkgconfig(libmongoc-1.0)  >= 1.7
+BuildRequires:  pkgconfig(libbson-1.0)    >= %{libver}
+BuildRequires:  pkgconfig(libmongoc-1.0)  >= %{libver}
 %else
-Provides:       bundled(libbson) = 1.7.0
-Provides:       bundled(mongo-c-driver) = 1.7.0
+Provides:       bundled(libbson) = %{libver}
+Provides:       bundled(mongo-c-driver) = %{libver}
 %endif
 BuildRequires:  snappy-devel
 BuildRequires:  zlib-devel
@@ -88,10 +86,8 @@ Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
 Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-%endif
 %if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
@@ -135,7 +131,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .pr633
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_MONGODB_VERSION/{s/.* "//;s/".*$//;p}' php_phongo.h)
@@ -325,6 +320,11 @@ exit $ret
 
 
 %changelog
+* Fri Sep 15 2017 Remi Collet <remi@remirepo.net> - 1.3.0~RC1-1
+- update to 1.3.0RC1
+- raise dependency on libbson and mongo-c-driver 1.8.0
+- raise dependency on PHP 5.5
+
 * Wed Aug 23 2017 Remi Collet <remi@remirepo.net> - 1.3.0~beta1-2
 - add patch for upcoming PHP 7.2.0RC1 and new timelib from
   https://github.com/mongodb/mongo-php-driver/pull/633