rpms/php-pear-Date/FC-6 php-pear-Date.spec,1.3,1.4

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4361/FC-6

Modified Files:
	php-pear-Date.spec 
Log Message:
remove requirement for dos2unix


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-6/php-pear-Date.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Date.spec	23 Nov 2006 23:26:32 -0000	1.3
+++ php-pear-Date.spec	21 Apr 2007 16:44:28 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Date
 Version:        1.4.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Date and Time Zone Classes
 
 Group:          Development/Libraries
@@ -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)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -30,7 +30,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{ClassName}-%{version}/%{ClassName}.xml
 cd %{ClassName}-%{version}
@@ -54,11 +54,11 @@
 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 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix end of line encoding
-dos2unix docdir/%{ClassName}/docs/TODO
+sed -i 's/\r//' docdir/%{ClassName}/docs/TODO
 
 
 %clean
@@ -86,6 +86,10 @@
 
 
 %changelog
+* Sat Apr 21 2007 Christopher Stone <chris.stone at gmail.com> 1.4.7-2
+- Use sed instead of dos2unix
+- Some other minor spec file cleanups
+
 * Thu Nov 23 2006 Christopher Stone <chris.stone at gmail.com> 1.4.7-1
 - Upstream Sync
 - Fix end-of-line encoding for TODO