[liborigin2] Update to 20101029

[Chen Lei]

commit 87b44cb8e243a325f1a8b5db9f45b2e618ec06d4
Author: Chen Lei <supercyper at 163.com>
Date:   Sun Oct 31 02:55:51 2010 +0800

    Update to 20101029

 .gitignore                     |    2 +-
 liborigin2-13092010-path.patch |   28 -
 liborigin2-20101029-path.patch |   18 +
 liborigin2.spec                |   34 +-
 sources                        |    2 +-
 tree.hh                        | 2710 ----------------------------------------
 6 files changed, 34 insertions(+), 2760 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c896250..565c2b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/liborigin2-13092010.zip
+/liborigin2-20101029.tar.gz
diff --git a/liborigin2-20101029-path.patch b/liborigin2-20101029-path.patch
new file mode 100644
index 0000000..12efb89
--- /dev/null
+++ b/liborigin2-20101029-path.patch
@@ -0,0 +1,18 @@
+--- liborigin2-20101029/liborigin2.pro.orig	2010-10-30 14:32:01.093027496 +0800
++++ liborigin2-20101029/liborigin2.pro	2010-10-30 14:37:37.149781442 +0800
+@@ -32,3 +32,15 @@
+ 	   Origin750Parser.cpp \
+ 	   Origin800Parser.cpp \
+ 	   Origin810Parser.cpp
++
++# Install directives
++INSTALLBASE = /usr
++
++target.path = $$LIBDIR
++headers.path = $$INSTALLBASE/include/liborigin2
++
++headers.files = $$HEADERS tree.hh
++INSTALLS = target headers
++
++# Avoid link against Qt gui modules
++QT -= core gui
diff --git a/liborigin2.spec b/liborigin2.spec
index 78a298f..19ecf54 100644
--- a/liborigin2.spec
+++ b/liborigin2.spec
@@ -1,22 +1,21 @@
 Name:		liborigin2
-Version:	13092010
+Version:	20101029
 Release:	1%{?dist}
 Summary:	Library for reading OriginLab project files
-License:	GPLv3
+License:	GPLv2+
 Group:		System Environment/Libraries
-URL:		http://soft.proindependent.com/%{name}/
-Source0:	http://download.berlios.de/qtiplot/%{name}-%{version}.zip
-Source1:	http://tree.phi-sci.com/tree.hh
+URL:		http://sourceforge.net/projects/liborigin/
+Source0:	http://downloads.sourceforge.net/liborigin/%{name}/2010/%{name}-%{version}.tar.gz
 # Fix build and install
-Patch0:		liborigin2-13092010-path.patch
+Patch0:		%{name}-20101029-path.patch
 BuildRequires:	qt4-devel boost-devel
 BuildRequires:	doxygen
-BuildRequires:	dos2unix
 
 %description
-liborigin2 is a library for reading OriginLab project files. OriginLab 
-Origin provides extensive scientific graphing and data analysis capabilities 
-and includes several new tools that simplify common operations.
+%{name} is library for reading OriginLab project files created with 
+versions ranging from 6.0 to 8.1. OriginLab Origin provides extensive 
+scientific graphing and data analysis capabilities and includes several
+new tools that simplify common operations.
 
 See http://www.originlab.com for more information about OriginLab Origin.
 
@@ -32,8 +31,7 @@ The %{name}-devel package contains libraries, header files and documentation
 for developing applications that use %{name}. 
 
 %prep
-%setup -q -n %{name}
-cp -p %{SOURCE1} .
+%setup -q
 %patch0 -p1
 
 # Convert encoding to UTF-8
@@ -41,14 +39,7 @@ 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
-find -maxdepth 1 -type f -exec dos2unix -k {} ";"
-
-# Remove exec permission
-find -type f -exec chmod 0644 {} ";"
-
 %build
-export PATH=%{_qt4_bindir}:$PATH
 %{_qt4_qmake} LIBDIR=%{_libdir}
 make %{?_smp_mflags}
 
@@ -72,7 +63,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc copying readme FORMAT
+%doc COPYING README FORMAT
 %{_libdir}/%{name}.so.*
 
 %files devel
@@ -82,5 +73,8 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}.so
 
 %changelog
+* Sat Oct 30 2010 Chen Lei <supercyper at 163.com> - 20101029-1
+- New upstream release
+
 * Wed Oct 13 2010 Chen Lei <supercyper at 163.com> - 13092010-1
 - New upstream release
diff --git a/sources b/sources
index 177d10a..bce20dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2b41c4d8a1e2d357dd2b5b331d31375  liborigin2-13092010.zip
+ec7d38375bf723ec9711488194601074  liborigin2-20101029.tar.gz