summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--FutureRows.h23
-rw-r--r--REFLECTION4
-rw-r--r--php-pecl-cassandra.spec8
3 files changed, 6 insertions, 29 deletions
diff --git a/FutureRows.h b/FutureRows.h
deleted file mode 100644
index 187a063..0000000
--- a/FutureRows.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright 2015-2016 DataStax, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef PHP_CASSANDRA_FUTURE_ROWS_H
-#define PHP_CASSANDRA_FUTURE_ROWS_H
-
-int
-php_cassandra_future_rows_get_result(cassandra_future_rows *future_rows, zval *timeout TSRMLS_DC);
-
-#endif /* PHP_CASSANDRA_FUTURE_ROWS_H */
diff --git a/REFLECTION b/REFLECTION
index 1540199..6f1f11b 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #76 cassandra version 1.2.0 ] {
+Extension [ <persistent> extension #76 cassandra version 1.2.1 ] {
- Dependencies {
Dependency [ spl (Required) ]
@@ -3139,7 +3139,7 @@ Extension [ <persistent> extension #76 cassandra version 1.2.0 ] {
Constant [ string TYPE_VARINT ] { varint }
Constant [ string TYPE_TIMEUUID ] { timeuuid }
Constant [ string TYPE_INET ] { inet }
- Constant [ string VERSION ] { 1.2.0 }
+ Constant [ string VERSION ] { 1.2.1 }
Constant [ string CPP_DRIVER_VERSION ] { 2.4.2 }
}
diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec
index db419ff..55182da 100644
--- a/php-pecl-cassandra.spec
+++ b/php-pecl-cassandra.spec
@@ -35,7 +35,7 @@
Summary: DataStax PHP Driver for Apache Cassandra
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 1.2.0
+Version: 1.2.1
Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: ASL 2.0
Group: Development/Languages
@@ -47,7 +47,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/
%else
Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
%endif
-Source1: https://raw.githubusercontent.com/datastax/php-driver/84035aa9d81c7c3b53f2f3461949e2bbdd300f46/ext/src/Cassandra/FutureRows.h
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{?scl_prefix}php-devel >= 5.5
@@ -118,8 +117,6 @@ mv NTS/package.xml .
mv %{pecl_name}-%{version}%{?prever} NTS
%endif
-cp %{SOURCE1} NTS/src/Cassandra
-
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
%{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
@@ -262,6 +259,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Thu Jul 28 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1 (no change)
+
* Wed Jul 27 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
- Update to 1.2.0