From 49e781087ad3aab37d046269d4833c3c81d2f28b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 2 Apr 2016 09:39:09 +0200 Subject: php-mcnetic-zipstreamer: 1.0 --- php-mcnetic-zipstreamer-warn.patch | 11 ----------- php-mcnetic-zipstreamer.spec | 15 ++++++--------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 php-mcnetic-zipstreamer-warn.patch diff --git a/php-mcnetic-zipstreamer-warn.patch b/php-mcnetic-zipstreamer-warn.patch deleted file mode 100644 index 0e6295c..0000000 --- a/php-mcnetic-zipstreamer-warn.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ZipStreamer.php.rpm 2016-01-08 12:15:06.445995538 +0100 -+++ src/ZipStreamer.php 2016-01-08 12:15:32.810095324 +0100 -@@ -668,7 +668,7 @@ - } - - public function update($data) { -- return $this->peclDeflateStream->update($data); -+ return ($data ? $this->peclDeflateStream->update($data) : false); - } - - public function finish() { diff --git a/php-mcnetic-zipstreamer.spec b/php-mcnetic-zipstreamer.spec index 72f4d5a..0034c3d 100644 --- a/php-mcnetic-zipstreamer.spec +++ b/php-mcnetic-zipstreamer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 44c99c659abf4dac92882437c1da68de824ca9d0 +%global gh_commit e57c198486242476587d04844084adbe8330581d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner McNetic %global gh_project PHPZipStreamer @@ -15,7 +15,7 @@ Name: php-mcnetic-zipstreamer Epoch: 1 -Version: 0.7 +Version: 1.0 Release: 1%{?dist} Summary: Stream zip files without i/o overhead @@ -24,9 +24,6 @@ License: GPLv3+ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz -# See https://github.com/McNetic/PHPZipStreamer/issues/29 -Patch1: %{name}-warn.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-composer(theseer/autoload) @@ -70,9 +67,6 @@ Autoloader: %{_datadir}/php/%{namespace}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch1 -p0 -b .rpm -find . -name \*.rpm -exec rm {} \; - %build %{_bindir}/phpab -o src/autoload.php src @@ -123,6 +117,9 @@ rm -rf %{buildroot} %changelog +* Sat Apr 2 2016 Remi Collet - 1:1.0.1 +- update to 1.0 + * Wed Jan 20 2016 Remi Collet - 1:0.7.1 - fix version, from review #1296901 @@ -133,4 +130,4 @@ rm -rf %{buildroot} * Fri Jan 8 2016 Remi Collet - 1.7.1 - initial package - add patch to workaround error raised by pecl_http - see https://github.com/McNetic/PHPZipStreamer/issues/29 \ No newline at end of file + see https://github.com/McNetic/PHPZipStreamer/issues/29 -- cgit