[qt5-qttools] 5.1.1-1

Rex Dieter rdieter at fedoraproject.org
Wed Aug 28 20:33:52 UTC 2013


commit 1cb76a54472e268cd53dd23bf814327bf55a2b23
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Aug 28 15:33:39 2013 -0500

    5.1.1-1
    
    - qttools-5.1.1
    - qt5-assistant, qt5-qdbusviewer, qt5-designer-plugin-webkit subpkgs (to match qt4)

 .gitignore       |    1 +
 qt5-qttools.spec |  115 ++++++++++++++++++++++++++++++++++++++++++------------
 sources          |    2 +-
 3 files changed, 92 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0217b3a..0afb870 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qttools-opensource-src-5.0.2.tar.xz
+/qttools-opensource-src-5.1.1.tar.xz
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 4b9a16a..16d247d 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -2,15 +2,15 @@
 %global qt_module qttools
 %global system_clucene 1
 
-Summary: Qt5 - QtTool components 
+Summary: Qt5 - QtTool components
 Name:    qt5-qttools
-Version: 5.0.2
-Release: 4%{?dist}
+Version: 5.1.1
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url: http://qt-project.org/
-Source0: http://download.qt-project.org/archive/qt/5.0/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+Source0: http://download.qt-project.org/official_releases/qt/5.1/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 
 Patch1: qttools-system_clucene.patch
 
@@ -22,20 +22,20 @@ Source23: qdbusviewer.desktop
 BuildRequires: desktop-file-utils
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtbase-static
+BuildRequires: qt5-qtdeclarative-static
+BuildRequires: qt5-qtwebkit-devel
+
 %if 0%{?system_clucene}
 BuildRequires: clucene09-core-devel
 %endif
 
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
 
-Provides: qt5-assistant = %{version}-%{release}
-Provides: qt5-qdbusviewer = %{version}-%{release}
-
-%description 
+%description
 %{summary}.
 
 %package devel
-Summary: Development files for %{name} 
+Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Provides: qt5-designer = %{version}-%{release}
@@ -49,6 +49,25 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 %description static
 %{summary}.
 
+%package -n qt5-assistant
+Summary: Documentation browser for Qt5
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description -n qt5-assistant
+%{summary}.
+
+%package -n qt5-designer-plugin-webkit
+Summary: Qt5 designer plugin for WebKit
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description -n qt5-designer-plugin-webkit
+%{summary}.
+
+%package -n qt5-qdbusviewer
+Summary: D-Bus debugger and viewer
+%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
+%description -n qt5-qdbusviewer
+QDbusviewer can be used to inspect D-Bus objects of running programs
+and invoke methods on those objects.
+
 
 %prep
 %setup -q -n qttools-opensource-src-%{version}%{?pre:-%{pre}}
@@ -88,7 +107,7 @@ for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
   install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist.png
 done
 
-# put non-conflicting binaries with -qt5 postfix in %%{_bindir} 
+# put non-conflicting binaries with -qt5 postfix in %%{_bindir}
 mkdir %{buildroot}%{_bindir}
 pushd %{buildroot}%{_qt5_bindir}
 for i in * ; do
@@ -133,31 +152,63 @@ touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 fi
 
-%files 
-%{_bindir}/assistant*
-%{_bindir}/qdbus*
-%{_bindir}/qdbusviewer*
-%{_qt5_bindir}/assistant*
-%{_qt5_bindir}/qdbus*
-%{_qt5_bindir}/qdbusviewer*
+%files
+%{_bindir}/qdbus-qt5
+%{_qt5_bindir}/qdbus
+%{_qt5_bindir}/qdbus-qt5
 %{_qt5_libdir}/libQt5CLucene.so.5*
 %{_qt5_libdir}/libQt5Designer.so.5*
 %{_qt5_libdir}/libQt5DesignerComponents.so.5*
 %{_qt5_libdir}/libQt5Help.so.5*
 %{_qt5_datadir}/phrasebooks/
+
+%post -n qt5-assistant
+touch --no-create %{_datadir}/icons/hicolor ||:
+
+%posttrans -n qt5-assistant
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun -n qt5-assistant
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
+
+%files -n qt5-assistant
+%{_bindir}/assistant-qt5
+%{_qt5_bindir}/assistant*
 %{_datadir}/applications/*assistant.desktop
-%{_datadir}/applications/*qdbusviewer.desktop
 %{_datadir}/icons/hicolor/*/apps/assistant*.*
+
+%files -n qt5-designer-plugin-webkit
+%{_qt5_archdatadir}/plugins/designer/libqwebview.so
+
+%post -n qt5-qdbusviewer
+touch --no-create %{_datadir}/icons/hicolor ||:
+
+%posttrans -n qt5-qdbusviewer
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun -n qt5-qdbusviewer
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
+
+%files -n qt5-qdbusviewer
+%{_bindir}/qdbusviewer*
+%{_qt5_bindir}/qdbusviewer*
+%{_datadir}/applications/*qdbusviewer.desktop
 %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.*
 
-%post devel 
+%post devel
 touch --no-create %{_datadir}/icons/hicolor ||:
 
-%posttrans devel 
+%posttrans devel
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database -q &> /dev/null ||:
 
-%postun devel 
+%postun devel
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
@@ -182,15 +233,23 @@ fi
 %{_qt5_bindir}/qcollectiongenerator*
 %{_qt5_bindir}/qhelpconverter*
 %{_qt5_bindir}/qhelpgenerator*
-%{_qt5_headerdir}/Qt*/
+%{_qt5_headerdir}/QtCLucene/
+%{_qt5_headerdir}/QtDesigner/
+%{_qt5_headerdir}/QtDesignerComponents/
+%{_qt5_headerdir}/QtHelp/
 %{_qt5_libdir}/libQt5CLucene.prl
 %{_qt5_libdir}/libQt5CLucene.so
 %{_qt5_libdir}/libQt5Designer*.prl
 %{_qt5_libdir}/libQt5Designer*.so
 %{_qt5_libdir}/libQt5Help.prl
 %{_qt5_libdir}/libQt5Help.so
-%{_qt5_libdir}/cmake/Qt5*/
-%{_qt5_libdir}/pkgconfig/Qt5*.pc
+%{_qt5_libdir}/cmake/Qt5Designer/
+%{_qt5_libdir}/cmake/Qt5Help/
+%{_qt5_libdir}/cmake/Qt5LinguistTools/
+%{_qt5_libdir}/pkgconfig/Qt5CLucene.pc
+%{_qt5_libdir}/pkgconfig/Qt5Designer.pc
+%{_qt5_libdir}/pkgconfig/Qt5DesignerComponents.pc
+%{_qt5_libdir}/pkgconfig/Qt5Help.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 %{_datadir}/applications/*designer.desktop
 %{_datadir}/applications/*linguist.desktop
@@ -198,11 +257,17 @@ fi
 %{_datadir}/icons/hicolor/*/apps/linguist*.*
 
 %files static
+%{_qt5_headerdir}/QtUiTools/
 %{_qt5_libdir}/libQt5UiTools.*a
 %{_qt5_libdir}/libQt5UiTools.prl
-
+%{_qt5_libdir}/cmake/Qt5UiTools/
+%{_qt5_libdir}/pkgconfig/Qt5UiTools.pc
 
 %changelog
+* Wed Aug 28 2013 Rex Dieter <rdieter at fedoraproject.org> 5.1.1-1
+- qttools-5.1.1
+- qt5-assistant, qt5-qdbusviewer, qt5-designer-plugin-webkit subpkgs (to match qt4)
+
 * Mon Aug 19 2013 Rex Dieter <rdieter at fedoraproject.org> 5.0.2-4
 - use system clucene09-core
 
diff --git a/sources b/sources
index beb7f4b..ad45c2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93ddcfdb87c6a784b0a921d09eafbdad  qttools-opensource-src-5.0.2.tar.xz
+022073d32ff9d408de0182b5d1f01781  qttools-opensource-src-5.1.1.tar.xz


More information about the scm-commits mailing list