From 7619dfe9855d3f7dcb27ca21148eace2c36d4868 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 23 Jun 2017 16:32:51 +0200
Subject: upstream patch for 7.2

---
 php-pecl-solr2.spec | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'php-pecl-solr2.spec')

diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec
index b1e7cc4..3f58361 100644
--- a/php-pecl-solr2.spec
+++ b/php-pecl-solr2.spec
@@ -35,14 +35,15 @@ Summary:        Object oriented API to Apache Solr
 Summary(fr):    API orientée objet pour Apache Solr
 Name:           %{?sub_prefix}php-pecl-solr2
 Version:        2.4.0
-Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        PHP
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/solr
 
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         upstream.patch
+
 BuildRequires:  %{?scl_prefix}php-devel
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-curl
@@ -102,6 +103,12 @@ Obsoletes:     php71w-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php71u-pecl-%{pecl_name}2 <= %{version}
 Obsoletes:     php71w-pecl-%{pecl_name}2 <= %{version}
 %endif
+%if "%{php_version}" > "7.2"
+Obsoletes:     php72u-pecl-%{pecl_name}  <= %{version}
+Obsoletes:     php72w-pecl-%{pecl_name}  <= %{version}
+Obsoletes:     php72u-pecl-%{pecl_name}2 <= %{version}
+Obsoletes:     php72w-pecl-%{pecl_name}2 <= %{version}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -148,7 +155,7 @@ sed -e 's/role="test"/role="src"/' \
 mv %{pecl_name}-%{version}%{?prever} NTS
 
 cd NTS
-
+%patch0 -p1 -b .upstream
 # Check version
 DIR=src/php$(%{__php} -r 'echo PHP_MAJOR_VERSION;')
 extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' $DIR/php_solr_version.h)
@@ -185,8 +192,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # Install XML package description
@@ -283,12 +288,7 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-, root, root, -)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -303,6 +303,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 23 2017 Remi Collet <remi@remirepo.net> - 2.4.0-4
+- add upstream patch for PHP 7.2
+
 * Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-3
 - rebuild with PHP 7.1.0 GA
 
-- 
cgit