cleanup

1 files changed, 83 insertions, 47 deletions

diff --git a/php-pecl-raphf.spec b/php-pecl-raphf.spec
index c5aa3fc..40cf6ec 100644
--- a/php-pecl-raphf.spec
+++ b/php-pecl-raphf.spec
@@ -3,45 +3,48 @@
 #
 # Fedora spec file for php-pecl-raphf
 #
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
+
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
 %if 0%{?scl:1}
-%if "%{scl}" == "rh-php56"
-%global sub_prefix more-php56-
-%else
 %global sub_prefix %{scl_prefix}
-%endif
+%scl_package       php-pecl-raphf
 %endif
 
-%{?scl:          %scl_package        php-pecl-raphf}
-
-%global with_zts   0%{?__ztsphp:1}
+%global gh_commit  b07c6f39d2ef4059d3f4cebf695e1315dc3fd5ec
+%global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner   m6w6
+%global gh_project ext-raphf
+#global gh_date    20150930
+%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name  raphf
+#global prever     RC1
 # tests disabled because of circular dependency on pecl/http
 # tests requires pecl/http 2.0.0
 %global with_tests %{?_with_tests:1}%{!?_with_tests:0}
-%if "%{php_version}" < "5.6"
-%global ini_name  %{pecl_name}.ini
-%else
-%global ini_name  40-%{pecl_name}.ini
-%endif
-#global prever    RC1
+%global ini_name   40-%{pecl_name}.ini
 
 Summary:        Resource and persistent handles factory
-Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        1.1.2
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Name:           %{?scl_prefix}php-pecl-%{pecl_name}
+Version:        2.0.0
+%if 0%{?gh_date}
+Release:        0.5.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
+%else
+Release:        5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+%endif
 License:        BSD
-Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
-Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  %{?scl_prefix}php-devel > 5.3
+BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 %if %{with_tests}
 BuildRequires:  %{?scl_prefix}php-pecl-http >= 2.0.0
@@ -64,13 +67,19 @@ Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
 Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
+%if "%{php_version}" > "7.1"
+Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "7.2"
+Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
@@ -90,7 +99,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %package devel
 Summary:       %{name} developer files (header)
-Group:         Development/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Requires:      %{?scl_prefix}php-devel%{?_isa}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel = %{version}-%{release}
@@ -101,16 +109,21 @@ These are the files needed to compile programs using %{name}.
 
 
 %prep
-%setup -q -c
+%setup -qc
+%if 0%{?gh_date}
+mv %{gh_project}-%{gh_commit} NTS
+mv NTS/package.xml .
+%else
 mv %{pecl_name}-%{version}%{?prever} NTS
+%endif
 
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_RAPHF_VERSION/{s/.* "//;s/".*$//;p}' php_raphf.h)
-if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}.
+if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:dev}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}%{?gh_date:dev}.
    exit 1
 fi
 cd ..
@@ -131,6 +144,8 @@ EOF
 
 
 %build
+%{?dtsenable}
+
 cd NTS
 %{_bindir}/phpize
 %configure \
@@ -147,7 +162,7 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
+%{?dtsenable}
 
 make -C NTS \
      install INSTALL_ROOT=%{buildroot}
@@ -167,14 +182,15 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 
 # 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
+do [ -f NTS/tests/$i ] && install -Dpm 644 NTS/tests/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/$i
+   [ -f NTS/$i ]       && install -Dpm 644 NTS/$i       %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
 done
 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
 
 
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
 # when pear installed alone, after us
 %triggerin -- %{?scl_prefix}php-pear
 if [ -x %{__pecl} ] ; then
@@ -234,12 +250,7 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -253,7 +264,6 @@ rm -rf %{buildroot}
 %endif
 
 %files devel
-%defattr(-,root,root,-)
 %doc %{pecl_testdir}/%{pecl_name}
 %{php_incldir}/ext/%{pecl_name}
 
@@ -263,21 +273,47 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Mar  8 2016 Remi Collet <remi@fedoraproject.org> - 1.1.2-2
+* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.0.0-5
+- rebuild for PHP 7.2.0beta1 new API
+
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-4
+- rebuild with PHP 7.1.0 GA
+
+* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-3
+- rebuild for PHP 7.1 new API version
+
+* Sat Mar  5 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-2
 - adapt for F24
-- fix license management
 
-* Tue Jan 19 2016 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
-- Update to 1.1.2 (stable)
+* Tue Jan 19 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
+- Update to 2.0.0 (stable)
+
+* Mon Dec  7 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.4.RC1
+- Update to 2.0.0RC1 (beta)
+- sources from pecl tarball
+
+* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.3.20150930gitb07c6f3
+- rebuild for PHP 7.0.0RC5 new API version
+- new snapshot
+
+* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.2.20150721git6d04f5b
+- F23 rebuild with rh_layout
+
+* Tue Jul 28 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.1.20150721git6d04f5b
+- bump version (as upstream)
+
+* Wed Jul 22 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-0.4.20150721git6d04f5b
+- rebuild against php 7.0.0beta2
+- sources from github
 
-* Mon Dec  7 2015 Remi Collet <remi@fedoraproject.org> - 1.1.1-0.1.RC1
-- Update to 1.1.1RC1 (beta)
+* Wed Jul  8 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-0.3
+- rebuild against php 7.0.0beta1
 
-* Tue Jul 28 2015 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
-- Update to 1.1.0 (stable)
+* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-0.2
+- rebuild for "rh_layout" (php70)
 
-* Sun Jun 21 2015 Remi Collet <remi@fedoraproject.org> - 1.0.4-5
-- allow build against rh-php56 (as more-php56)
+* Thu Mar 26 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-0.1
+- git snapshot for PHP 7
 - drop runtime dependency on pear, new scriptlets
 
 * Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-4.1