summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-10-12 06:19:22 +0200
committerRemi Collet <fedora@famillecollet.com>2012-10-12 06:19:22 +0200
commit319b69c4e0c0141c2ff0b6aaf487048d42248268 (patch)
tree4a5e578f5e61c0777d07edb11b5c1e7a51ecc02f
parent3a867b18b33b4bd55e40ab2f448e0bec57ffac62 (diff)
php-pecl-http: sync with rawhide
-rw-r--r--pecl_http-build.patch11
-rw-r--r--php-pecl-http.spec24
2 files changed, 15 insertions, 20 deletions
diff --git a/pecl_http-build.patch b/pecl_http-build.patch
deleted file mode 100644
index a2f6e38..0000000
--- a/pecl_http-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up pecl_http-2.0.0dev7/php_http_message.h.ORIG pecl_http-2.0.0dev7/php_http_message.h
---- pecl_http-2.0.0dev7/php_http_message.h.ORIG 2012-03-09 16:56:03.000000000 +0100
-+++ pecl_http-2.0.0dev7/php_http_message.h 2012-03-09 16:56:09.000000000 +0100
-@@ -25,7 +25,6 @@
- }
-
- typedef php_http_info_type_t php_http_message_type_t;
--typedef struct php_http_message php_http_message_t;
-
- struct php_http_message {
- PHP_HTTP_INFO_IMPL(http, type)
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index c4e8664..2213983 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -3,12 +3,12 @@
# The project is pecl_http but the extension is only http
%global proj_name pecl_http
%global pecl_name http
-%global prever dev7
-%global devver dev7
+%global prever alpha1
+%global devver dev
Name: php-pecl-http
Version: 2.0.0
-Release: 0.6.%{prever}%{?dist}
+Release: 0.10.%{prever}%{?dist}
Summary: Extended HTTP support
License: BSD
@@ -19,10 +19,6 @@ Source0: http://pecl.php.net/get/%{proj_name}-%{version}%{?prever}.tgz
# From http://www.php.net/manual/en/http.configuration.php
Source1: %{proj_name}.ini
-# Fix RHEL build
-# http://svn.php.net/viewvc?view=revision&revision=324058
-Patch0: %{proj_name}-build.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-devel >= 5.4.0
BuildRequires: php-pear
@@ -76,8 +72,6 @@ These are the files needed to compile programs using HTTP extension.
%prep
%setup -c -q
-%patch0 -p0 -b .build
-
extver=$(sed -n '/#define PHP_HTTP_EXT_VERSION/{s/.* "//;s/".*$//;p}' %{proj_name}-%{version}%{?prever}/php_http.h)
if test "x${extver}" != "x%{version}%{?devver}"; then
: Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?devver}.
@@ -163,6 +157,18 @@ rm -rf %{buildroot}
%changelog
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-0.10.alpha1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Apr 21 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.9.alpha1
+- update to 2.0.0alpha1
+
+* Sat Mar 31 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.8.dev10
+- update to 2.0.0dev10
+
+* Fri Mar 16 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.7.dev8
+- update to 2.0.0dev8
+
* Fri Mar 09 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.6.dev7
- update to 2.0.0dev7