[qt] 4.8.0

[Jaroslav Reznik]

commit ff98402c2b9ace32d85a9b4ee86ea020844710a5
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Thu Dec 15 14:46:57 2011 +0100

    4.8.0

 .gitignore                                         |    3 +-
 ...erywhere-opensource-src-4.8.0-QTBUG-21754.patch |  146 --------------------
 ...c-4.8.0-QTBUG-22420-revert-x11-map-global.patch |   65 ---------
 qt.spec                                            |   32 +----
 sources                                            |    9 +-
 5 files changed, 15 insertions(+), 240 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59dde2c..e3f899b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@
 /hi32-phonon-gstreamer.png
 /hi48-phonon-gstreamer.png
 /hi64-phonon-gstreamer.png
-/qt-everywhere-opensource-src-4.7.4.tar.gz
-/qt-everywhere-opensource-src-4.8.0-rc1.tar.gz
+/qt-everywhere-opensource-src-4.8.0.tar.gz
diff --git a/qt.spec b/qt.spec
index c4df4b0..3c0be39 100644
--- a/qt.spec
+++ b/qt.spec
@@ -11,19 +11,13 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.0
-Release: 0.29.rc1%{?dist}
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
 Group: System Environment/Libraries
 Url: http://qt.nokia.com/
-%if 0%{?snap:1}
-# git clone git://gitorious.org/qt/qt.git ; cd qt
-# git archive --prefix qt-everywhere-opensource-src-%{version}/ 4.8 | xz -9 
-Source0: qt-everywhere-opensource-src-4.8.0-20111002.tar.xz
-%else
-Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}-rc1.tar.gz
-%endif
+Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: qt4 < %{version}-%{release}
@@ -101,12 +95,6 @@ Patch74: qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch
 Patch75: qt-ppc64-crash.patch
 
 # upstream patches
-# Applications crash when using a visual with 24 bits per pixel 
-# https://bugreports.qt.nokia.com/browse/QTBUG-21754
-Patch100: qt-everywhere-opensource-src-4.8.0-QTBUG-21754.patch
-# Revert "Improved performance of mapFromGlobal/mapToGlobal on X11" (QTBUG-22420)
-# Fixes the position of misplaced mouse input
-Patch101: qt-everywhere-opensource-src-4.8.0-QTBUG-22420-revert-x11-map-global.patch
 
 # security patches
 
@@ -434,8 +422,6 @@ popd
 %patch75 -p1 -b .ppc64-crash
 
 # upstream patches
-%patch100 -p1 -b .QTBUG-21754
-%patch101 -p1 -b .QTBUG-22420-revert-x11-map-global
 
 # security fixes
 
@@ -547,11 +533,6 @@ make %{?_smp_mflags}
 # recreate .qm files
 LD_LIBRARY_PATH=`pwd`/lib bin/lrelease translations/*.ts
 
-%if 0%{?snap:1}
-# fixup/generate docs
-LD_LIBRARY_PATH=`pwd`/lib QT_PLUGIN_PATH=`pwd`/plugins make docs
-%endif
-
 
 %install
 rm -rf %{buildroot}
@@ -818,11 +799,7 @@ fi
 
 %files -f qt.lang
 %defattr(-,root,root,-)
-%if ! 0%{?snap}
-%doc README 
-%doc LICENSE.GPL3
-%endif
-%doc LICENSE.LGPL LGPL_EXCEPTION.txt
+%doc README LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
 %dir %{_qt4_libdir}
@@ -1069,6 +1046,9 @@ fi
 
 
 %changelog
+* Thu Dec 15 2011 Jaroslav Reznik <jreznik at redhat.com> 4.8.0-1
+- 4.8.0
+
 * Mon Dec 12 2011 Jaroslav Reznik <jreznik at redhat.com> 4.8.0-0.29.rc1
 - Fixes the position of misplaced mouse input (QTBUG-22420)
 
diff --git a/sources b/sources
index 93fa7df..e855fd5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,10 @@
+e8a5fdbeba2927c948d9f477a6abe904  qt-everywhere-opensource-src-4.8.0.tar.gz
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
+60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
+7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
+0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png
+12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-3e003b671384df8d1cb77dd6cc804934  qt-everywhere-opensource-src-4.8.0-rc1.tar.gz
+86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
+153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
+8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg