From 538f9c95f650479c0c8bf1202578aa6d6e320c83 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jun 27 2016 16:13:59 +0000 Subject: upate to 2.0.0RC8 - rebuild for https://fedoraproject.org/wiki/Changes/php70 - fix license installation --- diff --git a/.gitignore b/.gitignore index b57927a..d73e586 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /yaml-1.1.0.tgz /yaml-1.1.1.tgz /yaml-1.2.0.tgz +/yaml-2.0.0RC8.tgz diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec index 507578d..44d8bf8 100644 --- a/php-pecl-yaml.spec +++ b/php-pecl-yaml.spec @@ -1,41 +1,29 @@ %global pecl_name yaml -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else %global ini_name 40-%{pecl_name}.ini -%endif - -%{!?__pecl: %global __pecl %{_bindir}/pecl} +%global prever RC8 Name: php-pecl-yaml -Version: 1.2.0 -Release: 2%{?dist} +Version: 2.0.0 +Release: 0.9.%{prever}%{?dist} Summary: Support for YAML 1.1 serialization using the LibYAML library Group: Development/Languages License: MIT URL: http://code.google.com/p/php-yaml/ -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz + +BuildRequires: php-devel >= 7 +BuildRequires: php-pear +BuildRequires: libyaml-devel -BuildRequires: php-devel >= 5.2.0 -BuildRequires: php-pear -BuildRequires: libyaml-devel -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} -Requires(post): %{__pecl} -Requires(postun): %{__pecl} +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} Provides: php-%{pecl_name} = %{version} Provides: php-%{pecl_name}%{?_isa} = %{version} Provides: php-pecl(%{pecl_name}) = %{version} Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - %description The YAML PHP Extension provides a wrapper to the LibYAML library. It gives the @@ -44,28 +32,27 @@ constructs as valid YAML 1.1 documents. %prep %setup -q -c + # Remove test file to avoid regsitration (pecl list-files yaml) -sed -e '/role="test"/d' package.xml >%{pecl_name}-%{version}/package.xml +sed -e 's/role="test"/role="src"/' \ + -e '/LICENSE/s/role="doc"/role="src"/' \ + package.xml >%{pecl_name}-%{version}%{?prever}/package.xml %build -cd %{pecl_name}-%{version} +cd %{pecl_name}-%{version}%{?prever} phpize %configure make %{?_smp_mflags} %check -cd %{pecl_name}-%{version} -# Test fails due to datetime handling issues since PHP 5.6.19RC1 -# https://bugs.php.net/bug.php?id=71696 -rm tests/yaml_002.phpt - +cd %{pecl_name}-%{version}%{?prever} make test NO_INTERACTION=1 REPORT_EXIT_STATUS=1 %install -cd %{pecl_name}-%{version} +cd %{pecl_name}-%{version}%{?prever} make install INSTALL_ROOT=%{buildroot} # Basic configuration @@ -90,6 +77,8 @@ yaml.output_canonical = 0 yaml.output_indent = 2 ; Set the preferred line width. -1 means unlimited. yaml.output_width = 80 +; Enable/disable serialized php object processing. +yaml.decode_php = 0 EOF # Package info @@ -102,17 +91,8 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%post -%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : - - -%postun -if [ $1 -eq 0 ] ; then -%{pecl_uninstall} %{pecl_name} >/dev/null || : -fi - - %files +%license %{pecl_name}-%{version}%{?prever}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %config(noreplace) %{_sysconfdir}/php.d/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -120,6 +100,11 @@ fi %changelog +* Mon Jun 27 2016 Remi Collet - 2.0.0-0.1.RC8 +- upate to 2.0.0RC8 +- rebuild for https://fedoraproject.org/wiki/Changes/php70 +- fix license installation + * Thu Mar 10 2016 Remi Collet - 1.2.0-2 - enable test suite for Koschei - drop 1 known to fail test diff --git a/sources b/sources index 160a97c..4991cc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17ab680320bce0889504bbe65535a700 yaml-1.2.0.tgz +05b80666e43d74e6b790deb8ea2de0c5 yaml-2.0.0RC8.tgz