Branch: master

ba530ccd 2014-10-01 13:28:53 François Andriot
RPM Packaging: update TQT3
M redhat/dependencies/tqt3/tqt3-14.0.0.spec
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 3f33d1d..fe6d042 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -46,8 +46,6 @@
 Source4:	tqt3config.desktop
 Source5:	build-examples.sh
 
-Patch15:	tqt3-14.0.0-add_tqt_home_dir_variable.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
 BuildRequires: glibc-devel
@@ -268,9 +266,6 @@
 %dir %{_datadir}/tqt3/
 %dir %{_datadir}/tqt3/doc/
 %dir %{_datadir}/tqt3/doc/html/
-%dir %{_datadir}/tqt3/mkspecs/
-%dir %{_datadir}/tqt3/phrasebooks/
-%dir %{_datadir}/tqt3/templates/
 %dir %{_datadir}/tqt3/tools/
 %dir %{_sysconfdir}/tqt3
 %{_libdir}/libtqt-mt.so.3
@@ -827,6 +822,7 @@
 
 %files -n tqt3-dev-tools
 %defattr(-,root,root,-)
+%dir %{_datadir}/tqt3/mkspecs/
 %{_datadir}/tqt3/mkspecs/*
 %{_datadir}/tqt3/doc/html/qmake*html
 %{_datadir}/tqt3/doc/html/qmake*dcf
@@ -866,6 +862,7 @@
 %{_datadir}/tqt3/doc/html/designer*html
 %{_datadir}/tqt3/doc/html/designer*dcf
 %{_datadir}/tqt3/doc/html/designer*jpg
+%dir %{_datadir}/tqt3/templates/
 %{_datadir}/tqt3/templates/*
 %{_libdir}/tqt3/plugins/designer/libcppeditor.so
 %{_libdir}/tqt3/plugins/designer/libdlgplugin.so
@@ -941,6 +938,7 @@
 %files -n tqt3-linguist
 %defattr(-,root,root,-)
 %{_bindir}/tqlinguist
+%dir %{_datadir}/tqt3/phrasebooks/
 %{_datadir}/tqt3/phrasebooks/*
 %{_datadir}/tqt3/doc/html/linguist*html
 %{_datadir}/tqt3/doc/html/linguist*dcf
@@ -1099,7 +1097,7 @@
 ##########
 
 %package -n tqt3-examples
-summary:	 Examples for TQt3
+summary:	Examples for TQt3
 Group:		System/GUI/Other
 
 %description -n tqt3-examples
@@ -1129,8 +1127,7 @@
 %__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
 %endif
 
-%patch15 -p1 -b .tqthomedir
-
+# Add missing sqlite3 header
 %__ln_s ../src/sql/drivers/sqlite3/qsql_sqlite3.h include/qsql_sqlite3.h
 
 # fix variables in 'qmake.conf'