SPECS: eventum.spec - no need to undos sources anymore, patches order

glen glen at pld-linux.org
Wed Oct 15 01:12:13 CEST 2008


Author: glen                         Date: Tue Oct 14 23:12:13 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no need to undos sources anymore, patches order

---- Files affected:
SPECS:
   eventum.spec (1.289 -> 1.290) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.289 SPECS/eventum.spec:1.290
--- SPECS/eventum.spec:1.289	Wed Oct 15 00:59:11 2008
+++ SPECS/eventum.spec	Wed Oct 15 01:12:07 2008
@@ -44,9 +44,9 @@
 Source14:	%{name}.logrotate
 Source15:	%{name}-lighttpd.conf
 Patch0:		%{name}-lf.patch
-Patch1:		%{name}-order.patch
-Patch2:		%{name}-jquery.patch
-Patch3:		%{name}-datepicker-dow.patch
+Patch1:		%{name}-jquery.patch
+Patch2:		%{name}-datepicker-dow.patch
+Patch3:		%{name}-order.patch
 # packaging patches that probably never go upstream
 Patch100:	%{name}-paths.patch
 Patch101:	%{name}-cvs-config.patch
@@ -461,8 +461,6 @@
 
 %prep
 %setup -q %{?snap:-n %{name}-%{snap}}%{?svn:-n %{name}-%{svn}}
-# undos the source
-find . -type f -print0 | xargs -0 sed -i -e 's,\r$,,'
 
 rm benchmark.php
 rm -r misc/upgrade/*v1.[123]* # too old to support in PLD Linux
@@ -476,9 +474,9 @@
 
 # bug fixes / features
 %patch0 -p1
-%{?with_order:%patch1 -p1}
-%patch2 -p0
-%patch3 -p1
+%patch1 -p0
+%patch2 -p1
+%{?with_order:%patch3 -p1}
 
 #%patch200 -p1
 
@@ -908,6 +906,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.290  2008/10/14 23:12:07  glen
+- no need to undos sources anymore, patches order
+
 Revision 1.289  2008/10/14 22:59:11  glen
 - up to r3749 add jquery update patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eventum.spec?r1=1.289&r2=1.290&f=u



More information about the pld-cvs-commit mailing list