rpms/QTeXEngine/devel QTeXEngine-path.patch, 1.2, 1.3 QTeXEngine.spec, 1.3, 1.4

[supercyper]

Author: supercyper

Update of /cvs/pkgs/rpms/QTeXEngine/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32126

Modified Files:
	QTeXEngine-path.patch QTeXEngine.spec 
Log Message:


QTeXEngine-path.patch:
 config.pri    |    2 +-
 src/src.pro   |   16 ++++++++++++++++
 test/test.pro |    2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

Index: QTeXEngine-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/QTeXEngine/devel/QTeXEngine-path.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- QTeXEngine-path.patch	17 Apr 2010 01:07:54 -0000	1.2
+++ QTeXEngine-path.patch	23 Jun 2010 06:02:34 -0000	1.3
@@ -1,6 +1,6 @@
-diff -Naur QTeXEngine.old/config.pri QTeXEngine/config.pri
---- QTeXEngine.old/config.pri	2009-08-05 10:27:02.000000000 +0800
-+++ QTeXEngine/config.pri	2010-01-25 23:59:37.401090753 +0800
+diff -Naur QTeXEngine.org/config.pri QTeXEngine/config.pri
+--- QTeXEngine.org/config.pri	2009-08-05 10:27:02.000000000 +0800
++++ QTeXEngine/config.pri	2010-06-23 13:45:14.930190467 +0800
 @@ -2,7 +2,7 @@
  CONFIG      += release
  
@@ -10,41 +10,37 @@ diff -Naur QTeXEngine.old/config.pri QTe
  
  	    
  	    
-diff -Naur QTeXEngine.old/QTeXEngine.pro QTeXEngine/QTeXEngine.pro
---- QTeXEngine.old/QTeXEngine.pro	2009-08-05 10:27:16.000000000 +0800
-+++ QTeXEngine/QTeXEngine.pro	2010-01-26 00:11:00.409340153 +0800
-@@ -3,6 +3,4 @@
- TEMPLATE = subdirs
- 
- SUBDIRS = \
--    src \
--    example \
--    test
-\ No newline at end of file
-+    src
-diff -Naur QTeXEngine.old/src/src.pro QTeXEngine/src/src.pro
---- QTeXEngine.old/src/src.pro	2009-08-05 10:29:40.000000000 +0800
-+++ QTeXEngine/src/src.pro	2010-01-26 00:38:51.903338460 +0800
-@@ -19,3 +19,21 @@
+diff -Naur QTeXEngine.org/src/src.pro QTeXEngine/src/src.pro
+--- QTeXEngine.org/src/src.pro	2009-08-05 10:29:40.000000000 +0800
++++ QTeXEngine/src/src.pro	2010-06-23 13:46:22.060191026 +0800
+@@ -19,3 +19,19 @@
  HEADERS  = QTeXEngine.h
  SOURCES += QTeXPaintEngine.cpp
  SOURCES += QTeXPaintDevice.cpp
-+# Install directives
-+INSTALLBASE = /usr
-+
-+target.path = $$LIBDIR
-+headers.path = $$INSTALLBASE/include/QTeXEngine
-+documentation.path = $$QTeXDOCDIR
-+example.path = $$QTeXDOCDIR
-+#test.path = $$QTeXDOCDIR
-+
-+headers.files = $$HEADERS
-+documentation.files += ../doc/html  \
-+			../COPYING.txt \
-+			../README.txt \
-+			../CHANGES.txt
-+example.files += ../example
-+#test.files += ../test
-+
-+INSTALLS = target headers documentation example
-
++# Install directives
++INSTALLBASE = /usr
++
++target.path = $$LIBDIR
++headers.path = $$INSTALLBASE/include/QTeXEngine
++documentation.path = $$QTeXDOCDIR
++example.path = $$QTeXDOCDIR
++
++headers.files = $$HEADERS
++documentation.files += ../doc/html  \
++			../COPYING.txt \
++			../README.txt \
++			../CHANGES.txt
++example.files += ../example
++
++INSTALLS = target headers documentation example
+diff -Naur QTeXEngine.org/test/test.pro QTeXEngine/test/test.pro
+--- QTeXEngine.org/test/test.pro	2009-08-05 10:30:28.000000000 +0800
++++ QTeXEngine/test/test.pro	2010-06-23 13:53:47.885439246 +0800
+@@ -7,6 +7,6 @@
+ DESTDIR      = ./
+ 
+ INCLUDEPATH += ../src
+-LIBS        += ../libQTeXEngine.a
++LIBS        += ../libQTeXEngine.so
+ 
+ SOURCES += test.cpp


Index: QTeXEngine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/QTeXEngine/devel/QTeXEngine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- QTeXEngine.spec	17 Apr 2010 01:59:44 -0000	1.3
+++ QTeXEngine.spec	23 Jun 2010 06:02:34 -0000	1.4
@@ -10,7 +10,6 @@ Source0:		http://download.berlios.de/qti
 Patch0:			QTeXEngine-path.patch
 # Fixes between 0.2 and svn1552 checkout
 Patch1:			QTeXEngine-svn1552.patch
-BuildRoot:		%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:		qt4-devel
 BuildRequires:		doxygen
 BuildRequires:		dos2unix
@@ -48,29 +47,29 @@ rm -rf example/.svn
 rm -rf test/.svn
 
 #fix source files for debug package
-find %{_builddir} -name '*.h' -exec dos2unix {} \;
-find %{_builddir} -name '*.hh' -exec dos2unix {} \;
-find %{_builddir} -name '*.hpp' -exec dos2unix {} \;
-find %{_builddir} -name '*.c' -exec dos2unix {} \;
-find %{_builddir} -name '*.cc' -exec dos2unix {} \;
-find %{_builddir} -name '*.cpp' -exec dos2unix {} \;
+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 {} \;
 
 %build
 export PATH=%{_qt4_bindir}:$PATH
-%_qt4_qmake QTeXDOCDIR=%{_defaultdocdir}/%{name}-%{version} LIBDIR=%{_libdir}
+pushd src
+%{_qt4_qmake} QTeXDOCDIR=%{_defaultdocdir}/%{name}-%{version} LIBDIR=%{_libdir}
 make %{?_smp_mflags}
+popd
 pushd doc
 doxygen Doxyfile
 popd
-dos2unix COPYING.txt
-dos2unix README.txt
-dos2unix CHANGES.txt
-dos2unix example/*
-dos2unix test/test*
+dos2unix -k *.txt
+dos2unix -k example/*
 
 %install
-rm -rf %{buildroot}
-make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install
+pushd src
+make install INSTALL="install -p" INSTALL_ROOT=%{buildroot}
+popd
 
 %post -p /sbin/ldconfig