[qt] fix missing CSS styles and JS functions in the generated HTML documentation, omitted from the upstre
Lukas Tinkl
ltinkl at fedoraproject.org
Wed Sep 14 11:27:54 UTC 2011
commit 7a24f72b3113a4a89e70f2e412f395fbb901121a
Author: Lukas Tinkl <lukas at kde.org>
Date: Wed Sep 14 13:27:32 2011 +0200
fix missing CSS styles and JS functions in the generated HTML
documentation, omitted from the upstream tarball
.gitignore | 1 +
qt.spec | 12 ++++++++++--
sources | 1 +
3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21ac8af..afa7b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/hi64-phonon-gstreamer.png
/qt-everywhere-opensource-src-4.7.3.tar.gz
/qt-everywhere-opensource-src-4.8.0-beta1.tar.gz
+/qt-doc-4.8.0-patch.tar.bz2
diff --git a/qt.spec b/qt.spec
index fa5efa0..97b133c 100644
--- a/qt.spec
+++ b/qt.spec
@@ -11,7 +11,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.0
-Release: 0.9.beta1%{?dist}
+Release: 0.10.beta1%{?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
@@ -84,6 +84,9 @@ Source24: qtconfig.desktop
Source30: hi128-app-qt4-logo.png
Source31: hi48-app-qt4-logo.png
+# fix missing CSS styles and JS functions in the generated HTML documentation, omitted from the upstream tarball
+Source100: qt-doc-4.8.0-patch.tar.bz2
+
## BOOTSTRAPPING, undef docs, demos, examples, phonon, webkit
## optional plugin bits
@@ -368,6 +371,7 @@ Qt libraries used for drawing widgets and OpenGL items.
%prep
%setup -q -n qt-everywhere-opensource-src-%{version}
+%setup -D -a 100 -n qt-everywhere-opensource-src-%{version}
%patch2 -p1 -b .multilib-optflags
@@ -398,7 +402,7 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
# some 64bit platforms assume -64 suffix, https://bugzilla.redhat.com/569542
%if "%{?__isa_bits}" == "64"
-%define platform linux-g++-64
+%define platform linux-g++-64
%endif
# https://bugzilla.redhat.com/478481
@@ -1010,6 +1014,10 @@ fi
%changelog
+* Wed Sep 14 2011 Lukas Tinkl <ltinkl at redhat.com> 1:4.8.0-0.10.beta1
+- fix missing CSS styles and JS functions in the generated HTML
+ documentation, omitted from the upstream tarball
+
* Wed Aug 17 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.0-0.9.beta1
- -graphicssystem raster (#712617)
- drop sqlite_pkg option
diff --git a/sources b/sources
index 30970a9..7ea4a99 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
b6d9da4c89cda9c555b9944f883e937a qt-everywhere-opensource-src-4.8.0-beta1.tar.gz
+b47216c36285edd5be55ada4cdfbd974 qt-doc-4.8.0-patch.tar.bz2
More information about the scm-commits
mailing list