This commit is contained in:
Remi Collet 2017-04-05 07:25:02 +02:00
parent 2fee7ad4ce
commit 3a2a82670a
3 changed files with 8 additions and 12 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ php-pecl-zip.spec~
/zip-1.13.3.tgz /zip-1.13.3.tgz
/zip-1.13.4.tgz /zip-1.13.4.tgz
/zip-1.13.5.tgz /zip-1.13.5.tgz
/zip-1.14.0.tgz

View File

@ -1,6 +1,6 @@
# Fedora spec file for php-pecl-zip # Fedora spec file for php-pecl-zip
# #
# Copyright (c) 2013-2016 Remi Collet # Copyright (c) 2013-2017 Remi Collet
# License: CC-BY-SA # License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/ # http://creativecommons.org/licenses/by-sa/4.0/
# #
@ -12,16 +12,14 @@
Summary: A ZIP archive management extension Summary: A ZIP archive management extension
Summary(fr): Une extension de gestion des ZIP Summary(fr): Une extension de gestion des ZIP
Name: php-pecl-zip Name: php-pecl-zip
Version: 1.13.5 Version: 1.14.0
Release: 4%{?dist} Release: 1%{?dist}
License: PHP License: PHP
Group: Development/Languages Group: Development/Languages
URL: http://pecl.php.net/package/zip URL: http://pecl.php.net/package/zip
Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
Patch0: %{pecl_name}-upstream.patch
BuildRequires: php-devel BuildRequires: php-devel
BuildRequires: pkgconfig(libzip) >= 1.0.0 BuildRequires: pkgconfig(libzip) >= 1.0.0
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -52,8 +50,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml -i package.xml
cd %{pecl_name}-%{version} cd %{pecl_name}-%{version}
%patch0 -p1 -b .upstream
# Sanity check, really often broken # Sanity check, really often broken
extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php5/php_zip.h) extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php5/php_zip.h)
if test "x${extver}" != "x%{version}%{?prever}"; then if test "x${extver}" != "x%{version}%{?prever}"; then
@ -61,10 +57,6 @@ if test "x${extver}" != "x%{version}%{?prever}"; then
exit 1 exit 1
fi fi
sed -e '/LICENSE_libzip/d' -i ../package.xml
# delete bundled libzip to ensure it is not used
rm -r lib
cd .. cd ..
: Create the configuration file : Create the configuration file
cat >%{ini_name} << 'EOF' cat >%{ini_name} << 'EOF'
@ -156,6 +148,9 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
%changelog %changelog
* Wed Apr 5 2017 Remi Collet <remi@remirepo.net> - 1.14.0-1
- Update to 1.14.0
* Tue Feb 28 2017 Remi Collet <remi@fedoraproject.org> - 1.13.5-4 * Tue Feb 28 2017 Remi Collet <remi@fedoraproject.org> - 1.13.5-4
- rebuild for new libzip - rebuild for new libzip

View File

@ -1 +1 @@
cd5ca079184c4032bdec7b385faa103d zip-1.13.5.tgz SHA512 (zip-1.14.0.tgz) = 4fb209c6b8e9bfb9ebc6ee46d1f5c09a21bb3e46aa6c8b971eff4661e822a8fcc6adbba3c438f814c24ff1d8c89f5eb29befc45768309226cfdff79d906652bc