add moc-boost-workaround.patch

[packages/qt4.git] / qt4.spec

diff --git a/qt4.spec b/qt4.spec
index a5a1f7e21747d34ae6235279c8e1071e9c733d92..349a2169982036af58297d4cd778dee07e0b7e22 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -60,7 +60,7 @@ Summary(pl.UTF-8):    Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):  Estrutura para rodar aplicações GUI Qt
 Name:          qt4
 Version:       4.8.6
-Release:       8
+Release:       12
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -104,6 +104,7 @@ Patch23:    0030-Memory-and-file-descriptor-leak-in-QFontCache.patch
 Patch24:       0034-Fix-raster-graphics-on-X11-RGB30.patch
 Patch25:       0065-Fix-QPainter-drawPolyline-painting-errors-with-cosme.patch
 Patch26:       0072-Fix-font-cache-check-in-QFontEngineFT-recalcAdvances.patch
+Patch27:       moc-boost-workaround.patch
 URL:           http://qt-project.org/
 %{?with_ibase:BuildRequires:   Firebird-devel}
 %{?with_openvg:BuildRequires:  Mesa-libOpenVG-devel}
@@ -1496,7 +1497,6 @@ Programas exemplo para o Qt versão.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-
 %patch17 -p0
 %patch18 -p0
 %patch19 -p1
@@ -1507,6 +1507,7 @@ Programas exemplo para o Qt versão.
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf
@@ -1671,6 +1672,9 @@ install -d $RPM_BUILD_ROOT{/etc/{env.d,qt4},%{_bindir},%{_desktopdir},%{_pixmaps
 install -d $RPM_BUILD_ROOT%{_qtdir}/plugins/{crypto,network}
 install -d $RPM_BUILD_ROOT%{_qtdir}/imports/org
 
+# for QtSolutions (qtlockedfile, qtsingleapplication, etc)
+install -d $RPM_BUILD_ROOT%{_includedir}/qt4/QtSolutions
+
 echo '#QT_GRAPHICSSYSTEM=raster' > $RPM_BUILD_ROOT/etc/env.d/QT_GRAPHICSSYSTEM
 
 %{__make} install \
@@ -2399,6 +2403,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n QtCore-devel -f QtCore-devel.files
 %defattr(644,root,root,755)
+%dir %{_includedir}/qt4/QtSolutions
 
 %files -n QtDBus-devel -f QtDBus-devel.files
 %defattr(644,root,root,755)