From 41f435ef2f82a049dea60f71f8d5311a703c7927 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 9 Sep 2017 17:40:36 +0200
Subject: Update to 0.5.3 open https://github.com/weltling/parle/pull/8 - cxx
 extension drop devel sub-package open
 https://github.com/weltling/parle/pull/7 - PHP 7.2 build error

---
 php-pecl-parle.spec | 60 ++++++++++++++++++++---------------------------------
 1 file changed, 22 insertions(+), 38 deletions(-)

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

diff --git a/php-pecl-parle.spec b/php-pecl-parle.spec
index c3fcd4c..28549ef 100644
--- a/php-pecl-parle.spec
+++ b/php-pecl-parle.spec
@@ -26,15 +26,13 @@ BuildRequires: devtoolset-6-toolchain
 
 Summary:        Parsing and lexing
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        0.5.1
+Version:        0.5.3
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 # Extension is BSD, libraries are Boost
 License:        BSD and Boost
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-# https://github.com/weltling/parle/pull/1
-Source1:        https://raw.githubusercontent.com/weltling/parle/master/lib/lexertl14/lexertl/licence_1_0.txt
 
 BuildRequires:  %{?scl_prefix}php-devel >= 7
 BuildRequires:  %{?scl_prefix}php-pear
@@ -60,6 +58,8 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{rele
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 %endif
 
+Obsoletes:     %{name}-devel < %{version}
+
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
@@ -88,34 +88,22 @@ generator tools for C/C++.
 Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
 
 
-%package devel
-Summary:       %{name} developer files (header)
-Group:         Development/Libraries
-Requires:      %{name}%{?_isa} = %{version}-%{release}
-Requires:      %{?scl_prefix}php-devel%{?_isa}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel = %{version}-%{release}
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel%{?_isa} = %{version}-%{release}
-%endif
-
-%description devel
-These are the files needed to compile programs using %{name}
-and upstream test suite.
-
-
 %prep
 %setup -qc
 mv %{pecl_name}-%{version} NTS
 
-# Don't install/register
-# see https://github.com/weltling/parle/pull/2
-sed %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/;/license/s/role="doc"/role="src"/'} \
-    -e '/tests/s/role=".*"/role="test"/'\
+# Don't install/register tests
+sed -e '/tests/s/role="test"/role="src"/'\
     -i package.xml
 
-cd NTS
-cp %{SOURCE1} lib/lexertl14/lexertl/licence_1_0.txt
+%if 0%{?_licensedir:1}
+sed -e '/LICENSE/s/role="doc"/role="src"/;/licence/s/role="doc"/role="src"/' \
+    -i package.xml
+mv NTS/lib/lexertl14/lexertl/licence_1_0.txt   NTS/LICENSE.lexert14
+mv NTS/lib/parsertl14/parsertl/licence_1_0.txt NTS/LICENSE.parsertl14
+%endif
 
+cd NTS
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_PARLE_VERSION/{s/.* "//;s/".*$//;p}' php_parle.h)
 if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
@@ -175,10 +163,7 @@ make -C ZTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
-# Test & Documentation
-for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
-done
+# Documentation
 for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
 do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
@@ -239,8 +224,7 @@ fi
 
 
 %files
-%{?_licensedir:%license NTS/LICENSE}
-%{?_licensedir:%license NTS/lib/lexertl14/lexertl/licence_1_0.txt}
+%{?_licensedir:%license NTS/LICENSE*}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -253,16 +237,16 @@ fi
 %endif
 
 
-%files devel
-%doc %{pecl_testdir}/%{pecl_name}
-%{php_incldir}/ext/%{pecl_name}
-
-%if %{with_zts}
-%{php_ztsincldir}/ext/%{pecl_name}
-%endif
+%changelog
+* Sat Sep  9 2017 Remi Collet <remi@remirepo.net> - 0.5.3-1
+- Update to 0.5.3
+- open https://github.com/weltling/parle/pull/8 - cxx extension
 
+* Sat Sep  9 2017 Remi Collet <remi@remirepo.net> - 0.5.2-1
+- Update to 0.5.2
+- drop devel sub-package
+- https://github.com/weltling/parle/pull/7 - PHP 7.2 build error
 
-%changelog
 * Sat Sep  9 2017 Remi Collet <remi@remirepo.net> - 0.5.1-1
 - initial package, version 0.5.1 (alpha)
 - open https://github.com/BenHanson/parsertl14/issues/1 license file
-- 
cgit