[QTeXEngine] move header file to %{_includedir}

[Chen Lei]

commit a4331560e9e824a0281e05e1fb0de652244367d4
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 11 10:55:31 2010 +0800

    move header file to %{_includedir}

 QTeXEngine-svn1552-path.patch |    2 +-
 QTeXEngine.spec               |   52 ++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 30 deletions(-)
---
diff --git a/QTeXEngine-svn1552-path.patch b/QTeXEngine-svn1552-path.patch
index a3934e9..f060868 100644
--- a/QTeXEngine-svn1552-path.patch
+++ b/QTeXEngine-svn1552-path.patch
@@ -9,7 +9,7 @@
 +INSTALLBASE = /usr
 +
 +target.path = $$LIBDIR
-+headers.path = $$INSTALLBASE/include/QTeXEngine
++headers.path = $$INSTALLBASE/include
 +
 +headers.files = $$HEADERS
 +INSTALLS = target headers
diff --git a/QTeXEngine.spec b/QTeXEngine.spec
index 97ee62e..90ccafa 100644
--- a/QTeXEngine.spec
+++ b/QTeXEngine.spec
@@ -1,6 +1,6 @@
 Name:		QTeXEngine
 Version:	0.2
-Release:	3.20100119svn%{?dist}
+Release:	4.20100119svn%{?dist}
 Summary:	Library enabling Qt based applications to easily export graphics to TeX
 License:	GPLv3
 Group:		System Environment/Libraries
@@ -10,15 +10,12 @@ Source0:	http://download.berlios.de/qtiplot/%{name}-%{version}-opensource.zip
 Patch0:		QTeXEngine-svn1552-path.patch
 # Fixes between 0.2 and svn1552 checkout
 Patch1:		QTeXEngine-svn1552.patch
-BuildRequires:	qt4-devel
-BuildRequires:	doxygen
-BuildRequires:	dos2unix
+BuildRequires:	qt4-devel doxygen dos2unix
 
 %description
-QTeXEngine is a library enabling Qt based applications to easily 
-export graphics created using the QPainter class to TeX. It is 
-built on top of QPaintEngine and uses the TikZ/Pgf graphic systems
-for TeX. 
+QTeXEngine is a library enabling Qt based applications to easily export
+graphics created using the QPainter class to TeX. It is built on top of
+QPaintEngine and uses the TikZ/Pgf graphic systems for TeX.
 
 %package devel
 Summary:	Development files for %{name}
@@ -28,47 +25,41 @@ Requires:	qt4-devel%{?_isa}
 Obsoletes:	%{name}-doc < 0.2-3.20100119svn
 
 %description devel
-The %{name}-devel package contains libraries, header files and
-documentation for developing applications that use %{name}.
+The %{name}-devel package contains library, header file and documentation
+for developing applications that use %{name}.
 
 %prep
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
 
-rm -rf example/.svn
-rm -rf test/.svn
+rm -rf {example,test}/.svn
+
+# Remove DOS line endings
 dos2unix -k *.txt
 dos2unix -k example/*
+dos2unix -k src/*
 
-#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 {} \;
+# Remove exec permission
+find -type f -exec chmod 0644 {} ";"
 
 %build
 export PATH=%{_qt4_bindir}:$PATH
 pushd src
 %{_qt4_qmake} CONFIG+=" QTeXEngineDll" LIBDIR=%{_libdir}
-make %{?_smp_mflags}
 popd
+make %{?_smp_mflags} -C src
+
 pushd doc
 doxygen Doxyfile
-# fix the time stamp
+# Fix the time stamp
 for file in html/*; do
 	touch -r Doxyfile $file
 done
 popd
 
 %install
-pushd src
-make install INSTALL="install -p" INSTALL_ROOT=%{buildroot}
-popd
+make install INSTALL="install -p" INSTALL_ROOT=%{buildroot} -C src
 
 %post -p /sbin/ldconfig
 
@@ -80,15 +71,18 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc *.txt
-%{_libdir}/*.so.*
+%{_libdir}/libQTeXEngine.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html example
-%{_includedir}/*
-%{_libdir}/*.so
+%{_includedir}/QTeXEngine.h
+%{_libdir}/libQTeXEngine.so
 
 %changelog
+* Fri Sep 10 2010 Chen Lei <supercyper at 163.com> - 0.2-4.20100119svn
+- move header file to %%{_includedir}
+
 * Fri Jul 09 2010 Chen Lei <supercyper at 163.com> - 0.2-3.20100119svn
 - add missing BR: qt4-devel