packages: irrlicht/irrlicht-system-libs.patch, irrlicht/irrlicht.spec - use...

[lisu]

Author: lisu                         Date: Mon Oct  5 14:54:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use dos2unix to avoid problems when patching

---- Files affected:
packages/irrlicht:
   irrlicht-system-libs.patch (1.8 -> 1.9) , irrlicht.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/irrlicht/irrlicht-system-libs.patch
diff -u packages/irrlicht/irrlicht-system-libs.patch:1.8 packages/irrlicht/irrlicht-system-libs.patch:1.9
--- packages/irrlicht/irrlicht-system-libs.patch:1.8	Mon Oct  5 16:33:28 2009
+++ packages/irrlicht/irrlicht-system-libs.patch	Mon Oct  5 16:54:49 2009
@@ -28,7 +28,7 @@
  
  //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
 --- irrlicht-1.6/source/Irrlicht/Makefile~	2009-09-20 09:49:40.000000000 +0200
-+++ irrlicht-1.6/source/Irrlicht/Makefile	2009-10-05 16:06:43.000000000 +0200
++++ irrlicht-1.6/source/Irrlicht/Makefile	2009-10-05 16:53:15.000000000 +0200
 @@ -39,14 +39,11 @@
  IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o
  IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o

================================================================
Index: packages/irrlicht/irrlicht.spec
diff -u packages/irrlicht/irrlicht.spec:1.24 packages/irrlicht/irrlicht.spec:1.25
--- packages/irrlicht/irrlicht.spec:1.24	Mon Oct  5 16:33:11 2009
+++ packages/irrlicht/irrlicht.spec	Mon Oct  5 16:54:49 2009
@@ -17,6 +17,7 @@
 Patch2:		%{name}-sparc.patch
 URL:		http://irrlicht.sourceforge.net/
 BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	dos2unix
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
@@ -79,6 +80,8 @@
 %prep
 %setup -q
 
+dos2unix include/IrrCompileConfig.h
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -139,6 +142,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2009/10/05 14:54:49  lisu
+- use dos2unix to avoid problems when patching
+
 Revision 1.24  2009/10/05 14:33:11  lisu
 - up to 1.6
 - patches updated
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/irrlicht/irrlicht-system-libs.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/irrlicht/irrlicht.spec?r1=1.24&r2=1.25&f=u