[liborigin2] Update to svn 1804

[Chen Lei]

commit 6a304a8ac2dbc01825a56c0e70ac09100be27e0e
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 4 08:49:08 2010 +0800

    Update to svn 1804

 .gitignore                     |    1 +
 liborigin2-svn1748-gcc45.patch |   11 --------
 liborigin2.spec                |   51 ++++++++++++++++++++++------------------
 sources                        |    1 +
 4 files changed, 30 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6cadd43..8afa9ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 liborigin2-20100629.tar.bz2
+/liborigin2-20100903.tar.bz2
diff --git a/liborigin2.spec b/liborigin2.spec
index 72ed746..450a9af 100644
--- a/liborigin2.spec
+++ b/liborigin2.spec
@@ -1,10 +1,9 @@
-%define svndate 20100629
-%define svnver 1748
-
+%define svndate 20100903
+%define svnver 1804
 
 Name:		liborigin2
 Version:	06042009
-Release:	5.%{svndate}svn%{?dist}
+Release:	6.%{svndate}svn%{?dist}
 Summary:	Library for reading OriginLab project files
 License:	GPLv3
 Group:		System Environment/Libraries
@@ -15,9 +14,8 @@ URL:		http://soft.proindependent.com/%{name}/
 #  svn export -r %{svnver} svn://svn.berlios.de/qtiplot/trunk/3rdparty/liborigin liborigin2-%{svndate}
 #  tar -cjvf liborigin2-%{svndate}.tar.bz2 liborigin2-%{svndate}
 Source0:	liborigin2-%{svndate}.tar.bz2
-# Fixes build and install
+# Fix build and install
 Patch0:		liborigin2-svn1748-path.patch
-Patch1:		liborigin2-svn1748-gcc45.patch
 BuildRequires:	qt4-devel boost-devel
 BuildRequires:	doxygen
 BuildRequires:	dos2unix
@@ -35,6 +33,7 @@ Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	boost-devel%{?_isa}
 Obsoletes:	%{name}-doc < 06042009-4.20100629svn
+
 %description devel
 The %{name}-devel package contains libraries, header files and documentation
 for developing applications that use %{name}. 
@@ -42,34 +41,37 @@ for developing applications that use %{name}.
 %prep
 %setup -q -n %{name}-%{svndate}
 %patch0 -p1
-%patch1 -p1
-#fix source files for debug package
-find -name '*.h' -exec dos2unix -k {} \;
-find -name '*.hh' -exec dos2unix -k {} \;
-find -name '*.hpp' -exec dos2unix -k {} \;
-find -name '*.c' -exec dos2unix -k {} \;
-find -name '*.cc' -exec dos2unix -k {} \;
-find -name '*.cpp' -exec dos2unix -k {} \;
-find -type d -exec chmod 0755 {} \;
-find -type f -exec chmod 0644 {} \;
+
+# Convert encoding to UTF-8
+iconv -f iso8859-5 -t utf-8 FORMAT > FORMAT.tmp
+touch -c -r FORMAT FORMAT.tmp
+mv -f  FORMAT.tmp FORMAT
+
+# Remove DOS line endings
+dos2unix -k FORMAT readme copying
+find -name '*.h' -exec dos2unix -k {} ";"
+find -name '*.hh' -exec dos2unix -k {} ";"
+find -name '*.hpp' -exec dos2unix -k {} ";"
+find -name '*.c' -exec dos2unix -k {} ";"
+find -name '*.cc' -exec dos2unix -k {} ";"
+find -name '*.cpp' -exec dos2unix -k {} ";"
+
+# Remove exec permission
+find -type d -exec chmod 0755 {} ";"
+find -type f -exec chmod 0644 {} ";"
 
 %build
 export PATH=%{_qt4_bindir}:$PATH
 %{_qt4_qmake} LIBDIR=%{_libdir}
 make %{?_smp_mflags}
+
 pushd doc
 doxygen Doxyfile
-# fix the time stamp
+# Fix the timestamp
 for file in html/*; do
 	touch -r Doxyfile $file
 done
 popd
-## file-not-utf8
-iconv -f iso8859-5 -t utf-8 FORMAT > FORMAT.tmp
-touch -c -r FORMAT FORMAT.tmp
-mv -f  FORMAT.tmp FORMAT
-# wrong-file-end-of-line-encoding 
-dos2unix -k FORMAT readme copying
 
 %install
 make install INSTALL="install -p" INSTALL_ROOT=%{buildroot}
@@ -93,6 +95,9 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}.so
 
 %changelog
+* Fri Sep 03 2010 Chen Lei <supercyper at 163.com> - 06042009-6.20100903svn
+- svn 1804
+
 * Thu Jul 29 2010 Chen Lei <supercyper at 163.com> - 06042009-5.20100629svn
 - rebuild(boost 1.44)
 
diff --git a/sources b/sources
index e856ae0..d2c9e60 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 5bfc760c08a6840ee1e8ec62948c397e  liborigin2-20100629.tar.bz2
+62db6c6ce0b603c62c45dd93748c560c  liborigin2-20100903.tar.bz2