summaryrefslogtreecommitdiffstats
path: root/php-pecl-hprose.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-04-02 16:34:49 +0200
committerRemi Collet <fedora@famillecollet.com>2015-04-02 16:34:49 +0200
commit99ba4769324cf7926cddc834b0c4c0700cac845f (patch)
tree0f970feef4ae245b1ce89353212b1e2241a19757 /php-pecl-hprose.spec
parent7c7c4c8c80b05cdada811c163505ee54b2b097d0 (diff)
php-pecl-hprose: add upstream fix for RHEL-5 and i386
Diffstat (limited to 'php-pecl-hprose.spec')
-rw-r--r--php-pecl-hprose.spec13
1 files changed, 12 insertions, 1 deletions
diff --git a/php-pecl-hprose.spec b/php-pecl-hprose.spec
index 1bb3ae0..11aa5b7 100644
--- a/php-pecl-hprose.spec
+++ b/php-pecl-hprose.spec
@@ -23,12 +23,14 @@
Summary: Hprose for PHP.
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.0.0
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: MIT
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+Patch0: %{pecl_name}-upstream.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{?scl_prefix}php-devel > 5.3
BuildRequires: %{?scl_prefix}php-pear
@@ -90,6 +92,11 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
+file *.c *.h src/*.c include/*.h
+sed -e 's/\r//' -i *.c *.h src/*.c include/*.h
+
+%patch0 -p1 -b .upstream
+
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_HPROSE_VERSION/{s/.* "//;s/".*$//;p}' php_hprose.h)
if test "x${extver}" != "x%{version}"; then
@@ -223,6 +230,10 @@ rm -rf %{buildroot}
%changelog
+* Sat Feb 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-2
+- add upstream fix
+- open https://github.com/hprose/hprose-pecl/issues/4 - CR/LF
+
* Sat Feb 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
- initial package, version 1.0.0 (stable)
- open https://github.com/hprose/hprose-pecl/issues/1 - php 7