php-pecl-yaz: 1.2.0 (php 5 and 7, stable)

2 files changed, 24 insertions, 11 deletions

diff --git a/REFLECTION b/REFLECTION
index e77a807..c0ddd6d 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #163 yaz version 1.1.9 ] {
+Extension [ <persistent> extension #189 yaz version 1.2.0 ] {
 
   - INI {
     Entry [ yaz.max_links <ALL> ]
@@ -87,6 +87,16 @@ Extension [ <persistent> extension #163 yaz version 1.1.9 ] {
         Parameter #2 [ <required> &$param2 ]
       }
     }
+    Function [ <internal:yaz> function yaz_cql_parse ] {
+
+      - Parameters [3] {
+        Parameter #0 [ <required> $param0 ]
+        Parameter #1 [ <required> $param1 ]
+        Parameter #2 [ <required> &$param2 ]
+      }
+    }
+    Function [ <internal:yaz> function yaz_cql_conf ] {
+    }
     Function [ <internal:yaz> function yaz_database ] {
     }
     Function [ <internal:yaz> function yaz_sort ] {
diff --git a/php-pecl-yaz.spec b/php-pecl-yaz.spec
index f454ac4..2e47384 100644
--- a/php-pecl-yaz.spec
+++ b/php-pecl-yaz.spec
@@ -8,7 +8,7 @@
 #
 %{?scl:          %scl_package        php-pecl-yaz}
 
-%global with_zts   0%{?__ztsphp:1}
+%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name  yaz
 %if "%{php_version}" < "5.6"
 %global ini_name   %{pecl_name}.ini
@@ -20,14 +20,13 @@
 
 Summary:        Z39.50/SRU client
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        1.1.9
+Version:        1.2.0
 Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  %{?scl_prefix}php-devel > 5.3
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  libyaz-devel >= 3.0.2
@@ -45,8 +44,10 @@ Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
+%endif
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
 # Other third party repo stuff
@@ -62,6 +63,10 @@ Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
 %endif
+%if "%{php_version}" > "7.0"
+Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -79,6 +84,8 @@ Find more information at:
 - http://www.indexdata.com/phpyaz
 - http://www.indexdata.com/yaz
 
+Documentation: http://php.net/yaz
+
 Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
 
 
@@ -135,8 +142,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # install config file
@@ -211,12 +216,7 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 
@@ -231,6 +231,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 22 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
+- Update to 1.2.0
+
 * Wed Mar  9 2016 Remi Collet <remi@fedoraproject.org> - 1.1.9-2
 - adapt for F24
 - drop runtime dependency on pear, new scriptlets