rpms/QTeXEngine/devel QTeXEngine-svn1552-path.patch, NONE, 1.1 QTeXEngine.spec, 1.4, 1.5 QTeXEngine-path.patch, 1.3, NONE import.log, 1.1, NONE

[supercyper]

Author: supercyper

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

Modified Files:
	QTeXEngine.spec 
Added Files:
	QTeXEngine-svn1552-path.patch 
Removed Files:
	QTeXEngine-path.patch import.log 
Log Message:


QTeXEngine-svn1552-path.patch:
 src.pro |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE QTeXEngine-svn1552-path.patch ---
--- QTeXEngine/src/src.pro.org	2010-07-10 02:11:48.612591001 +0800
+++ QTeXEngine/src/src.pro	2010-07-10 02:13:09.729814076 +0800
@@ -19,3 +19,12 @@
 HEADERS  = QTeXEngine.h
 SOURCES += QTeXPaintEngine.cpp
 SOURCES += QTeXPaintDevice.cpp
+
+# Install directives
+INSTALLBASE = /usr
+
+target.path = $$LIBDIR
+headers.path = $$INSTALLBASE/include/QTeXEngine
+
+headers.files = $$HEADERS
+INSTALLS = target headers


Index: QTeXEngine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/QTeXEngine/devel/QTeXEngine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- QTeXEngine.spec	23 Jun 2010 06:02:34 -0000	1.4
+++ QTeXEngine.spec	9 Jul 2010 18:33:08 -0000	1.5
@@ -1,50 +1,45 @@
-Name:			QTeXEngine
-Version:		0.2
-Release:		2.20100119svn%{?dist}
-Summary:		Library enabling Qt based applications to easily export graphics to TeX
-License:		GPLv3
-Group:			System Environment/Libraries
-URL:			http://soft.proindependent.com/qtexengine/
-Source0:		http://download.berlios.de/qtiplot/%{name}-%{version}-opensource.zip
+Name:		QTeXEngine
+Version:	0.2
+Release:	3.20100119svn%{?dist}
+Summary:	Library enabling Qt based applications to easily export graphics to TeX
+License:	GPLv3
+Group:		System Environment/Libraries
+URL:		http://soft.proindependent.com/qtexengine/
+Source0:	http://download.berlios.de/qtiplot/%{name}-%{version}-opensource.zip
 # Fixes the build and install of QTeXEngine
-Patch0:			QTeXEngine-path.patch
+Patch0:		QTeXEngine-svn1552-path.patch
 # Fixes between 0.2 and svn1552 checkout
-Patch1:			QTeXEngine-svn1552.patch
-BuildRequires:		qt4-devel
-BuildRequires:		doxygen
-BuildRequires:		dos2unix
+Patch1:		QTeXEngine-svn1552.patch
+BuildRequires:	qt4-devel
+BuildRequires:	doxygen
+BuildRequires:	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}
-Group:			Development/Libraries
-Requires:		%{name}%{?_isa} = %{version}-%{release}
-Requires:		qt4-devel%{?_isa}
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	qt4-devel%{?_isa}
+Obsoletes:	%{name}-doc < 0.2-3.20100119svn
 
 %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}
 %patch0 -p1
 %patch1 -p1
+
 rm -rf example/.svn
 rm -rf test/.svn
+dos2unix -k *.txt
+dos2unix -k example/*
 
 #fix source files for debug package
 find  -name '*.h' -exec dos2unix -k {} \;
@@ -53,18 +48,22 @@ 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
 pushd src
-%{_qt4_qmake} QTeXDOCDIR=%{_defaultdocdir}/%{name}-%{version} LIBDIR=%{_libdir}
+%{_qt4_qmake} CONFIG+=" QTeXEngineDll" LIBDIR=%{_libdir}
 make %{?_smp_mflags}
 popd
 pushd doc
 doxygen Doxyfile
+# fix the time stamp
+for file in html/*; do
+	touch -r Doxyfile $file
+done
 popd
-dos2unix -k *.txt
-dos2unix -k example/*
 
 %install
 pushd src
@@ -80,21 +79,19 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{_defaultdocdir}/%{name}-%{version}
-%{_defaultdocdir}/%{name}-%{version}/*.txt
-%{_libdir}/libQTeXEngine.so.1*
+%doc *.txt
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}
-%{_libdir}/libQTeXEngine.so
-
-%files doc
-%defattr(-,root,root,-)
-%{_defaultdocdir}/%{name}-%{version}/html
-%{_defaultdocdir}/%{name}-%{version}/example
+%doc doc/html example
+%{_includedir}/*
+%{_libdir}/*.so
 
 %changelog
+* Fri Jul 09 2010 Chen Lei <supercyper at 163.com> - 0.2-3.20100119svn
+- add missing BR: qt4-devel
+
 * Sat Jan 23 2010 Chen Lei <supercyper at 163.com> - 0.2-2.20100119svn
 - svn 1552
 - split doc subpackage


--- QTeXEngine-path.patch DELETED ---


--- import.log DELETED ---