From e95faabd9e013ac41e51fca7830075334198f3d4 Mon Sep 17 00:00:00 2001
From: xulchris <xulchris@fedoraproject.org>
Date: Jun 02 2007 15:35:11 +0000
Subject: upstream sync


---

diff --git a/.cvsignore b/.cvsignore
index 9bca2ab..1d371e1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-HTTP_Request-1.4.0.tgz
+HTTP_Request-1.4.1.tgz
diff --git a/php-pear-HTTP-Request.spec b/php-pear-HTTP-Request.spec
index 8145635..55bde9f 100644
--- a/php-pear-HTTP-Request.spec
+++ b/php-pear-HTTP-Request.spec
@@ -2,7 +2,7 @@
 %define pear_name HTTP_Request
 
 Name:           php-pear-HTTP-Request
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        Provides an easy way to perform HTTP requests
 
@@ -13,7 +13,7 @@ Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
+BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR) >= 1.4.0b1
 Requires:       php-pear(Net_URL) >= 1.0.12
 Requires:       php-pear(Net_Socket) >= 1.0.2
@@ -27,7 +27,7 @@ Proxy Authentication, SSL, file uploads etc.
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -51,12 +51,12 @@ mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix rpmlint warnings
-dos2unix docdir/%{pear_name}/docs/example.php
-dos2unix docdir/%{pear_name}/docs/download-progress.php
+sed -i 's/\r//' docdir/%{pear_name}/docs/example.php
+sed -i 's/\r//' docdir/%{pear_name}/docs/download-progress.php
 
 
 %clean
@@ -82,5 +82,9 @@ fi
 
 
 %changelog
+* San Jun 02 2007 Christopher Stone <chris.stone@gmail.com> 1.4.1-1
+- Upstream sync (bz #242212)
+- Use sed instead of dos2unix
+
 * Sun Oct 29 2006 Christopher Stone <chris.stone@gmail.com> 1.4.0-1
 - Initial Release
diff --git a/sources b/sources
index 2804f0b..217ff6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2aacf8ac8ce9aa865269f6b5e4c256b9  HTTP_Request-1.4.0.tgz
+fa40bc40792c00f4a8c23b7e4532b401  HTTP_Request-1.4.1.tgz