rpms/php-pear-HTTP-Request/devel .cvsignore, 1.2, 1.3 php-pear-HTTP-Request.spec, 1.1, 1.2 sources, 1.2, 1.3

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTTP-Request/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12864/devel

Modified Files:
	.cvsignore php-pear-HTTP-Request.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Nov 2006 23:57:20 -0000	1.2
+++ .cvsignore	2 Jun 2007 15:35:11 -0000	1.3
@@ -1 +1 @@
-HTTP_Request-1.4.0.tgz
+HTTP_Request-1.4.1.tgz


Index: php-pear-HTTP-Request.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request/devel/php-pear-HTTP-Request.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-HTTP-Request.spec	7 Nov 2006 23:57:20 -0000	1.1
+++ php-pear-HTTP-Request.spec	2 Jun 2007 15:35:11 -0000	1.2
@@ -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 @@
 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 @@
 
 
 %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 @@
 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 @@
 
 
 %changelog
+* San Jun 02 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-1
+- Upstream sync (bz #242212)
+- Use sed instead of dos2unix
+
 * Sun Oct 29 2006 Christopher Stone <chris.stone at gmail.com> 1.4.0-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Nov 2006 23:57:20 -0000	1.2
+++ sources	2 Jun 2007 15:35:11 -0000	1.3
@@ -1 +1 @@
-2aacf8ac8ce9aa865269f6b5e4c256b9  HTTP_Request-1.4.0.tgz
+fa40bc40792c00f4a8c23b7e4532b401  HTTP_Request-1.4.1.tgz