rpms/QTeXEngine/devel QTeXEngine-path.patch, 1.1, 1.2 QTeXEngine.spec, 1.1, 1.2

[supercyper]

Author: supercyper

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

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


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

Index: QTeXEngine-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/QTeXEngine/devel/QTeXEngine-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- QTeXEngine-path.patch	25 Jan 2010 17:09:15 -0000	1.1
+++ QTeXEngine-path.patch	17 Apr 2010 01:07:54 -0000	1.2
@@ -36,7 +36,7 @@ diff -Naur QTeXEngine.old/src/src.pro QT
 +headers.path = $$INSTALLBASE/include/QTeXEngine
 +documentation.path = $$QTeXDOCDIR
 +example.path = $$QTeXDOCDIR
-+test.path = $$QTeXDOCDIR
++#test.path = $$QTeXDOCDIR
 +
 +headers.files = $$HEADERS
 +documentation.files += ../doc/html  \
@@ -44,7 +44,7 @@ diff -Naur QTeXEngine.old/src/src.pro QT
 +			../README.txt \
 +			../CHANGES.txt
 +example.files += ../example
-+test.files += ../test
++#test.files += ../test
 +
-+INSTALLS = target headers documentation example test
++INSTALLS = target headers documentation example
 


Index: QTeXEngine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/QTeXEngine/devel/QTeXEngine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- QTeXEngine.spec	25 Jan 2010 17:09:15 -0000	1.1
+++ QTeXEngine.spec	17 Apr 2010 01:07:55 -0000	1.2
@@ -56,7 +56,7 @@ find %{_builddir} -name '*.cpp' -exec do
 
 %build
 export PATH=%{_qt4_bindir}:$PATH
-%_qt4_qmake QTeXDOCDIR=%{_docdir}/%{name}-%{version} LIBDIR=%{_libdir}
+%_qt4_qmake QTeXDOCDIR=%{_defaultdocdir}/%{name}-%{version} LIBDIR=%{_libdir}
 make %{?_smp_mflags}
 pushd doc
 doxygen Doxyfile
@@ -80,8 +80,8 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%{_docdir}/%{name}-%{version}/*.txt
+%dir %{_defaultdocdir}/%{name}-%{version}
+%{_defaultdocdir}/%{name}-%{version}/*.txt
 %{_libdir}/libQTeXEngine.so.1*
 
 %files devel
@@ -91,16 +91,17 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}/html
-%{_docdir}/%{name}-%{version}/example
-%{_docdir}/%{name}-%{version}/test
+%{_defaultdocdir}/%{name}-%{version}/html
+%{_defaultdocdir}/%{name}-%{version}/example
 
 %changelog
-* Sat Jan 23 2010 Chen Lei <supercyper AT 163 DOT com> - 0.2-2.20100119svn
+* Sat Jan 23 2010 Chen Lei <supercyper at 163.com> - 0.2-2.20100119svn
 - svn 1552
 - split doc subpackage
-* Thu Jan 21 2010 Chen Lei <supercyper AT 163 DOT com> - 0.2-1
+
+* Thu Jan 21 2010 Chen Lei <supercyper at 163.com> - 0.2-1
 - use qt4-based rpm macros
 - drop Requires(post,postun)
-* Sun Nov 29 2009 Chen Lei <supercyper AT 163 DOT com> - 0.2-0
+
+* Sun Nov 29 2009 Chen Lei <supercyper at 163.com> - 0.2-0
 - initial rpm build