rpms/liborigin2/F-13 liborigin2-svn1748-path.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 liborigin2.spec, 1.2, 1.3 sources, 1.3, 1.4 liborigin2-path.patch, 1.2, NONE

[supercyper]

Author: supercyper

Update of /cvs/pkgs/rpms/liborigin2/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16080

Modified Files:
	.cvsignore liborigin2.spec sources 
Added Files:
	liborigin2-svn1748-path.patch 
Removed Files:
	liborigin2-path.patch 
Log Message:


liborigin2-svn1748-path.patch:
 liborigin.pro |   24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

--- NEW FILE liborigin2-svn1748-path.patch ---
--- liborigin2-20100629/liborigin.pro.org	2010-06-30 14:33:45.189669018 +0800
+++ liborigin2-20100629/liborigin.pro	2010-06-30 14:40:48.751899497 +0800
@@ -8,8 +8,8 @@
 DESTDIR      = ./
 
 #INCLUDEPATH += boost_1_33_0
-LIBS        += -lboost_date_time
-LIBS        += -lboost_thread
+LIBS        += -lboost_date_time-mt
+LIBS        += -lboost_thread-mt
 
 HEADERS += endianfstream.hh
 HEADERS += logging.hpp
@@ -17,10 +17,30 @@
 HEADERS += OriginFile.h
 HEADERS += OriginParser.h
 HEADERS += OriginDefaultParser.h
+HEADERS += Origin600Parser.h
+HEADERS += Origin610Parser.h
+HEADERS += Origin700Parser.h
 HEADERS += Origin750Parser.h
+HEADERS += Origin800Parser.h
+HEADERS += Origin810Parser.h
 
 SOURCES += OriginFile.cpp
 SOURCES += OriginParser.cpp
 SOURCES += OriginDefaultParser.cpp
+SOURCES += Origin600Parser.cpp
+SOURCES += Origin610Parser.cpp
+SOURCES += Origin700Parser.cpp
 SOURCES += Origin750Parser.cpp
+SOURCES += Origin800Parser.cpp
+SOURCES += 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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liborigin2/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jan 2010 05:13:05 -0000	1.2
+++ .cvsignore	30 Jun 2010 07:36:13 -0000	1.3
@@ -1 +1 @@
-liborigin2-20100119.tar.bz2
+liborigin2-20100629.tar.bz2


Index: liborigin2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liborigin2/F-13/liborigin2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- liborigin2.spec	22 Apr 2010 13:28:37 -0000	1.2
+++ liborigin2.spec	30 Jun 2010 07:36:14 -0000	1.3
@@ -1,95 +1,76 @@
-%define svndate 20100422
-%define svnver 1703
+%define svndate 20100629
+%define svnver 1748
 
 
-Name:			liborigin2
-Version:		06042009
-Release:		3.%{svndate}svn%{?dist}
-Summary:		Library for reading OriginLab project files
-License:		GPLv3
-Group:			System Environment/Libraries
-URL:			http://soft.proindependent.com/%{name}/
-#Source0:		http://download.berlios.de/qtiplot/%{name}-%{version}.zip
+Name:		liborigin2
+Version:	06042009
+Release:	4.%{svndate}svn%{?dist}
+Summary:	Library for reading OriginLab project files
+License:	GPLv3
+Group:		System Environment/Libraries
+URL:		http://soft.proindependent.com/%{name}/
+#Source0:	http://download.berlios.de/qtiplot/%{name}-%{version}.zip
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 #  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
+Source0:	liborigin2-%{svndate}.tar.bz2
 # Fixes build and install
-Patch0:			liborigin2-path.patch
-BuildRoot:		%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:		boost-devel
-BuildRequires:		qt4-devel
-BuildRequires:		doxygen
-BuildRequires:		dos2unix
+Patch0:		liborigin2-svn1748-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.
 
-See http://www.originlab.com for more informations about OriginLab Origin.
+See http://www.originlab.com for more information about OriginLab Origin.
 
 %package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name}%{?_isa} = %{version}-%{release}
-Requires:		boost-devel%{?_isa}
-Requires:		qt4-devel%{?_isa}
-
+Summary:	Development files for %{name}
+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 and header files for 
-developing applications that use %{name}. 
-
-%package doc
-Summary:		Documentation for %{name}
-Group:			Documentation
-Requires:		%{name} = %{version}-%{release}
-BuildArch:		noarch
-
-%description doc
-The %{name}-doc package contains documentation for the %{name} library.
+The %{name}-devel package contains libraries, header files and documentation
+for developing applications that use %{name}. 
 
 %prep
 %setup -q -n %{name}-%{svndate}
 %patch0 -p1
 #fix source files for debug package
-find . -name '*.h' -exec dos2unix {} \;
-find . -name '*.hh' -exec dos2unix {} \;
-find . -name '*.hpp' -exec dos2unix {} \;
-find . -name '*.c' -exec dos2unix {} \;
-find . -name '*.cc' -exec dos2unix {} \;
-find . -name '*.cpp' -exec dos2unix {} \;
-find . -type d -exec chmod 0755 {} \;
-find . -type f -exec chmod 0644 {} \;
+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 {} \;
 
 %build
 export PATH=%{_qt4_bindir}:$PATH
-%_qt4_qmake ORIDOCDIR=%{_defaultdocdir}/%{name}-%{version} LIBDIR=%{_libdir} \
-	BOOSTINC=%{_includedir}/boost
+%{_qt4_qmake} LIBDIR=%{_libdir}
 make %{?_smp_mflags}
 pushd doc
 doxygen Doxyfile
+# fix the time stamp
+for file in html/*; do
+	touch -r Doxyfile $file
+done
 popd
 ## file-not-utf8
 iconv -f iso8859-5 -t utf-8 FORMAT > FORMAT.tmp
-
-# wrong-file-end-of-line-encoding
-sed -i 's/\r//' FORMAT.tmp
 touch -c -r FORMAT FORMAT.tmp
 mv -f  FORMAT.tmp FORMAT
-
-sed 's/\r//' readme > readme.tmp
-touch -c -r readme readme.tmp
-mv -f  readme.tmp readme
-
-sed 's/\r//' copying > copying.tmp
-touch -c -r copying copying.tmp
-mv -f  copying.tmp copying
+# wrong-file-end-of-line-encoding 
+dos2unix -k FORMAT readme copying
 
 %install
-rm -rf %{buildroot}
-make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install
+make install INSTALL="install -p" INSTALL_ROOT=%{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -100,22 +81,19 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{_defaultdocdir}/%{name}-%{version}
-%{_defaultdocdir}/%{name}-%{version}/copying
-%{_defaultdocdir}/%{name}-%{version}/readme
-%{_defaultdocdir}/%{name}-%{version}/FORMAT
-%{_libdir}/%{name}.so.1*
+%doc copying readme FORMAT
+%{_libdir}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/
+%doc doc/html
+%{_includedir}/%{name}
 %{_libdir}/%{name}.so
 
-%files doc
-%defattr(-,root,root,-)
-%{_defaultdocdir}/%{name}-%{version}/html
-
 %changelog
+* Tue Jun 29 2010 Chen Lei <supercyper at 163.com> - 06042009-4.20100629svn
+- svn 1748
+
 * Thu Apr 22 2010 Chen Lei <supercyper at 163.com> - 06042009-3.20100422svn
 - svn 1703
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liborigin2/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Apr 2010 13:28:37 -0000	1.3
+++ sources	30 Jun 2010 07:36:14 -0000	1.4
@@ -1 +1 @@
-3fcd443b78c979a176df45cbe37dec80  liborigin2-20100422.tar.bz2
+5bfc760c08a6840ee1e8ec62948c397e  liborigin2-20100629.tar.bz2


--- liborigin2-path.patch DELETED ---