rpms/php-pear-Date/devel php-pear-Date.spec,1.2,1.3

Christopher Stone (xulchris) fedora-extras-commits at redhat.com
Thu Nov 23 23:27:02 UTC 2006


Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/devel

Modified Files:
	php-pear-Date.spec 
Log Message:
Some fixes for new release


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/devel/php-pear-Date.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Date.spec	23 Nov 2006 23:16:08 -0000	1.2
+++ php-pear-Date.spec	23 Nov 2006 23:26:32 -0000	1.3
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -57,6 +57,9 @@
 mkdir -p $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
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/*
+%doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
 %{pear_xmldir}/%{ClassName}.xml
 %{pear_testdir}/%{ClassName}
 %{pear_phpdir}/%{ClassName}
@@ -85,6 +88,8 @@
 %changelog
 * Thu Nov 23 2006 Christopher Stone <chris.stone at gmail.com> 1.4.7-1
 - Upstream Sync
+- Fix end-of-line encoding for TODO
+- Remove docs dir from %doc
 
 * Fri Jun 30 2006 Christopher Stone <chris.stone at gmail.com> 1.4.6-1
 - Initial Release




More information about the fedora-extras-commits mailing list