php-pecl-judy: package approved, switch spec

2 files changed, 52 insertions, 286 deletions

diff --git a/php-pecl-judy-dev.spec b/php-pecl-judy-dev.spec
deleted file mode 100644
index ce9299c..0000000
--- a/php-pecl-judy-dev.spec
+++ /dev/null
@@ -1,272 +0,0 @@
-# spec file for php-pecl-judy
-#
-# Copyright (c) 2013-2014 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
-#
-# Please, preserve the changelog entries
-#
-%{?scl:          %scl_package        php-pecl-judy}
-%{!?php_inidir:  %global php_inidir  %{_sysconfdir}/php.d}
-%{!?php_incldir: %global php_incldir %{_includedir}/php}
-%{!?__pecl:      %global __pecl      %{_bindir}/pecl}
-%{!?__php:       %global __php       %{_bindir}/php}
-
-%global with_zts   0%{?__ztsphp:1}
-%global pecl_name  Judy
-%global  ext_name  judy
-%if "%{php_version}" < "5.6"
-%global ini_name   %{ext_name}.ini
-%else
-%global ini_name   40-%{ext_name}.ini
-%endif
-
-Summary:        PHP Judy implements sparse dynamic arrays
-Name:           %{?scl_prefix}php-pecl-judy
-Version:        1.0.2
-Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
-License:        PHP
-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:  Judy-devel
-BuildRequires:  pcre-devel
-
-Requires(post): %{__pecl}
-Requires(postun): %{__pecl}
-Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
-Requires:       %{?scl_prefix}php(api) = %{php_core_api}
-%if "%{php_version}" < "5.4"
-# php 5.3.3 in EL-6 don't use arched virtual provides
-# so only requires real packages instead
-Requires:       %{?scl_prefix}php-common%{?_isa}
-%else
-Requires:       %{?scl_prefix}php-spl%{?_isa}
-%endif
-
-Provides:       %{?scl_prefix}php-%{ext_name} = %{version}
-Provides:       %{?scl_prefix}php-%{ext_name}%{?_isa} = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-
-# Package have been renamed
-Obsoletes:      %{?scl_prefix}php-pecl-Judy < 1.0.1
-Provides:       %{?scl_prefix}php-pecl-Judy = %{version}-%{release}
-
-%if "%{?vendor}" == "Remi Collet"
-# Other third party repo stuff
-%if "%{php_version}" > "5.4"
-Obsoletes:      php53-pecl-%{pecl_name}
-Obsoletes:      php53u-pecl-%{pecl_name}
-Obsoletes:      php54-pecl-%{pecl_name}
-%endif
-%if "%{php_version}" > "5.5"
-Obsoletes:      php55u-pecl-%{pecl_name}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes:      php56u-pecl-%{pecl_name}
-%endif
-%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
-
-%description
-PHP Judy implements sparse dynamic arrays (aka Judy Arrays).
-This extension is based on the Judy C library. A Judy array
-consumes memory only when it is populated, yet can grow to
-take advantage of all available memory if desired. Judy's key
-benefits are scalability, high performance, and memory efficiency.
-
-
-%package devel
-Summary:       %{name} developer files (header)
-Group:         Development/Libraries
-Requires:      %{name}%{?_isa} = %{version}-%{release}
-Requires:      %{?scl_prefix}php-devel%{?_isa}
-# Package have been renamed
-Obsoletes:     %{?scl_prefix}php-pecl-Judy-devel < 1.0.1
-Provides:      %{?scl_prefix}php-pecl-Judy-devel = %{version}-%{release}
-
-%description devel
-These are the files needed to compile programs using %{name}.
-
-
-%prep
-%setup -q -c
-mv %{pecl_name}-%{version} NTS
-
-cd NTS
-# Sanity check, really often broken
-extver=$(sed -n '/#define PHP_JUDY_VERSION/{s/.* "//;s/".*$//;p}' php_judy.h)
-if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}.
-   exit 1
-fi
-cd ..
-
-%if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
-cp -pr NTS ZTS
-%endif
-
-# Create configuration file
-cat << 'EOF' | tee %{ini_name}
-; Enable %{pecl_name} extension module
-extension=%{ext_name}.so
-EOF
-
-
-%build
-cd NTS
-%{_bindir}/phpize
-%configure \
-    --with-libdir=%{_lib} \
-    --with-php-config=%{_bindir}/php-config
-
-make %{?_smp_mflags}
-
-%if %{with_zts}
-cd ../ZTS
-%{_bindir}/zts-phpize
-%configure \
-    --with-libdir=%{_lib} \
-    --with-php-config=%{_bindir}/zts-php-config
-
-make %{?_smp_mflags}
-%endif
-
-
-%install
-rm -rf %{buildroot}
-
-make -C NTS install INSTALL_ROOT=%{buildroot}
-
-# install config file
-install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-
-# Install XML package description
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-%if %{with_zts}
-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
-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
-
-
-%post
-%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
-    %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-
-
-%check
-: Minimal load test for NTS extension
-cd NTS
-%{__php} --no-php-ini \
-    --define extension=modules/%{ext_name}.so \
-    --modules | grep %{ext_name}
-
-: Upstream test suite for NTS extension
-TEST_PHP_EXECUTABLE=%{_bindir}/php \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{ext_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{_bindir}/php -n run-tests.php
-
-
-%if %{with_zts}
-: Minimal load test for ZTS extension
-cd ../ZTS
-%{__ztsphp} --no-php-ini \
-    --define extension=modules/%{ext_name}.so \
-    --modules | grep %{ext_name}
-
-: Upstream test suite for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{ext_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php
-%endif
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc %{pecl_docdir}/%{pecl_name}
-%exclude %{pecl_docdir}/%{pecl_name}/examples
-%{pecl_xmldir}/%{name}.xml
-%config(noreplace) %{php_inidir}/%{ini_name}
-%{php_extdir}/%{ext_name}.so
-
-%if %{with_zts}
-%config(noreplace) %{php_ztsinidir}/%{ini_name}
-%{php_ztsextdir}/%{ext_name}.so
-%endif
-
-
-%files devel
-%defattr(-,root,root,-)
-%doc %{pecl_testdir}/%{pecl_name}
-%doc %{pecl_docdir}/%{pecl_name}/examples
-%{php_incldir}/ext/%{ext_name}
-
-%if %{with_zts}
-%{php_ztsincldir}/ext/%{ext_name}
-%endif
-
-
-%changelog
-* Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 1.0.2-2
-- use %%{ini_name} macro
-- add numerical prefix to extension configuration file
-
-* Fri Nov 29 2013 Remi Collet <rcollet@redhat.com> - 1.0.2-1
-- adapt for SCL
-
-* Sun Nov 03 2013 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
-- Update to 1.0.2 (stable)
-
-* Fri Nov 01 2013 Remi Collet <remi@fedoraproject.org> - 1.0.1-3
-- missing BR pcre-devel
-
-* Mon Oct 21 2013 Remi Collet <remi@fedoraproject.org> - 1.0.1-2
-- move tests and examples in devel subpackage
-
-* Mon Oct 21 2013 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
-- rename from php-pecl-Judy to php-pecl-judy
-- Update to 1.0.1 (stable)
-- install doc in pecl doc_dir
-- install tests in pecl test_dir
-- drop merged patches
-
-* Thu Oct 10 2013 Remi Collet <remi@fedoraproject.org> - 1.0.0-2
-- fix extension name in configuration file
-
-* Wed Oct  9 2013 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
-- initial package, version 1.0.0 (stable)
diff --git a/php-pecl-judy.spec b/php-pecl-judy.spec
index 7469669..ce9299c 100644
--- a/php-pecl-judy.spec
+++ b/php-pecl-judy.spec
@@ -6,6 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
+%{?scl:          %scl_package        php-pecl-judy}
 %{!?php_inidir:  %global php_inidir  %{_sysconfdir}/php.d}
 %{!?php_incldir: %global php_incldir %{_includedir}/php}
 %{!?__pecl:      %global __pecl      %{_bindir}/pecl}
@@ -14,38 +15,62 @@
 %global with_zts   0%{?__ztsphp:1}
 %global pecl_name  Judy
 %global  ext_name  judy
+%if "%{php_version}" < "5.6"
 %global ini_name   %{ext_name}.ini
+%else
+%global ini_name   40-%{ext_name}.ini
+%endif
 
 Summary:        PHP Judy implements sparse dynamic arrays
-Name:           php-pecl-judy
+Name:           %{?scl_prefix}php-pecl-judy
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-BuildRequires:  php-devel > 5.3
-BuildRequires:  php-pear
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  %{?scl_prefix}php-devel > 5.3
+BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  Judy-devel
 BuildRequires:  pcre-devel
 
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
-Requires:       php(zend-abi) = %{php_zend_api}
-Requires:       php(api) = %{php_core_api}
+Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
+Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 %if "%{php_version}" < "5.4"
 # php 5.3.3 in EL-6 don't use arched virtual provides
 # so only requires real packages instead
-Requires:       php-common%{?_isa}
+Requires:       %{?scl_prefix}php-common%{?_isa}
 %else
-Requires:       php-spl%{?_isa}
+Requires:       %{?scl_prefix}php-spl%{?_isa}
 %endif
 
-Provides:       php-%{ext_name} = %{version}
-Provides:       php-%{ext_name}%{?_isa} = %{version}
-Provides:       php-pecl(%{pecl_name}) = %{version}
-Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides:       %{?scl_prefix}php-%{ext_name} = %{version}
+Provides:       %{?scl_prefix}php-%{ext_name}%{?_isa} = %{version}
+Provides:       %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+
+# Package have been renamed
+Obsoletes:      %{?scl_prefix}php-pecl-Judy < 1.0.1
+Provides:       %{?scl_prefix}php-pecl-Judy = %{version}-%{release}
+
+%if "%{?vendor}" == "Remi Collet"
+# Other third party repo stuff
+%if "%{php_version}" > "5.4"
+Obsoletes:      php53-pecl-%{pecl_name}
+Obsoletes:      php53u-pecl-%{pecl_name}
+Obsoletes:      php54-pecl-%{pecl_name}
+%endif
+%if "%{php_version}" > "5.5"
+Obsoletes:      php55u-pecl-%{pecl_name}
+%endif
+%if "%{php_version}" > "5.6"
+Obsoletes:      php56u-pecl-%{pecl_name}
+%endif
+%endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
 # Filter shared private
@@ -66,7 +91,10 @@ benefits are scalability, high performance, and memory efficiency.
 Summary:       %{name} developer files (header)
 Group:         Development/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
-Requires:      php-devel%{?_isa}
+Requires:      %{?scl_prefix}php-devel%{?_isa}
+# Package have been renamed
+Obsoletes:     %{?scl_prefix}php-pecl-Judy-devel < 1.0.1
+Provides:      %{?scl_prefix}php-pecl-Judy-devel = %{version}-%{release}
 
 %description devel
 These are the files needed to compile programs using %{name}.
@@ -118,6 +146,8 @@ make %{?_smp_mflags}
 
 
 %install
+rm -rf %{buildroot}
+
 make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # install config file
@@ -182,12 +212,15 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
+%clean
+rm -rf %{buildroot}
+
+
 %files
 %defattr(-,root,root,-)
 %doc %{pecl_docdir}/%{pecl_name}
 %exclude %{pecl_docdir}/%{pecl_name}/examples
 %{pecl_xmldir}/%{name}.xml
-
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{ext_name}.so
 
@@ -198,6 +231,7 @@ REPORT_EXIT_STATUS=1 \
 
 
 %files devel
+%defattr(-,root,root,-)
 %doc %{pecl_testdir}/%{pecl_name}
 %doc %{pecl_docdir}/%{pecl_name}/examples
 %{php_incldir}/ext/%{ext_name}
@@ -210,6 +244,10 @@ REPORT_EXIT_STATUS=1 \
 %changelog
 * Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 1.0.2-2
 - use %%{ini_name} macro
+- add numerical prefix to extension configuration file
+
+* Fri Nov 29 2013 Remi Collet <rcollet@redhat.com> - 1.0.2-1
+- adapt for SCL
 
 * Sun Nov 03 2013 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
 - Update to 1.0.2 (stable)