php-pecl-zip: 1.12.2

1 files changed, 24 insertions, 17 deletions

diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec
index 19d7ef2..fd2db02 100644
--- a/php-pecl-zip.spec
+++ b/php-pecl-zip.spec
@@ -17,8 +17,8 @@
 Summary:      A ZIP archive management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.12.1
-Release:      2%{?dist}.1
+Version:      1.12.2
+Release:      1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 %if %{with_libzip}
 License:      PHP
 %else
@@ -30,12 +30,6 @@ URL:          http://pecl.php.net/package/zip
 
 Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-# https://github.com/pierrejoye/php_zip/pull/3 (merged)
-# Cleanups and fix build warnings
-Patch0:       zip-git.patch
-# use system libzip 0.11 instead of bundled copy
-Patch1:       zip-systemlibzip.patch
-
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-devel
 %if %{with_libzip}
@@ -54,9 +48,11 @@ Provides:     php-pecl(%{pecl_name})%{?_isa} = %{version}
 Provides:     php-%{pecl_name} = %{version}-%{release}
 Provides:     php-%{pecl_name}%{?_isa} = %{version}-%{release}
 
+%if 0%{?fedora} < 20
 # Filter private shared
 %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
 %{?filter_setup}
+%endif
 
 
 %description
@@ -71,11 +67,7 @@ Zip est une extension pour créer et lire les archives au format ZIP.
 
 cd %{pecl_name}-%{version}
 
-%patch0 -p1 -b .git
-rm -f LICENSE.git
-
 %if %{with_libzip}
-%patch1 -p1 -b .systemlibzip
 # delete bundled libzip to ensure it is not used (except zipint.h)
 rm lib/*.c
 %endif
@@ -94,14 +86,13 @@ cp -pr %{pecl_name}-%{version} %{pecl_name}-zts
 
 
 %build
-export PHP_RPATH=no
-
 cd %{pecl_name}-%{version}
 %{_bindir}/phpize
 %configure \
 %if %{with_libzip}
   --with-libzip \
 %endif
+  --with-libdir=%{_lib} \
   --with-php-config=%{_bindir}/php-config
 
 make %{?_smp_mflags}
@@ -113,6 +104,7 @@ cd ../%{pecl_name}-zts
 %if %{with_libzip}
   --with-libzip \
 %endif
+  --with-libdir=%{_lib} \
   --with-php-config=%{_bindir}/zts-php-config
 
 make %{?_smp_mflags}
@@ -133,6 +125,15 @@ make -C %{pecl_name}-zts install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini
 %endif
 
+# Test & Documentation
+cd %{pecl_name}-%{version}
+for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
+do install -Dpm 644 $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 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
+done
+
 
 %check
 cd %{pecl_name}-%{version}
@@ -163,7 +164,7 @@ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
 NO_INTERACTION=1 \
 TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
-%{_bindir}/php \
+%{_bindir}/zts-php \
    run-tests.php
 %endif
 
@@ -184,8 +185,8 @@ fi
 
 %files
 %defattr(-, root, root, -)
-%doc %{pecl_name}-%{version}/{CREDITS,LICENSE}
-%doc %{pecl_name}-%{version}/examples
+%doc %{pecl_docdir}/%{pecl_name}
+%doc %{pecl_testdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 %config(noreplace) %{php_inidir}/%{pecl_name}.ini
 %{php_extdir}/%{pecl_name}.so
@@ -197,6 +198,12 @@ fi
 
 
 %changelog
+* Wed Oct 23 2013 Remi Collet <remi@fedoraproject.org> 1.12.2-1
+- update to 1.12.2
+- drop merged patches
+- install doc in pecl doc_dir
+- install tests in pecl test_dir
+
 * Tue Aug 20 2013 Remi Collet <remi@fedoraproject.org> 1.12.1-2.1
 - backport stuff