diff --git a/assistant5.desktop b/assistant5.desktop index e477459..8f1d2e7 100644 --- a/assistant5.desktop +++ b/assistant5.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Categories=Qt;Development;Documentation +Categories=Qt;Development;Documentation; Encoding=UTF-8 Exec=/usr/bin/assistant-qt5 Name=Qt 5 Assistant diff --git a/assistant5.png b/assistant5.png deleted file mode 100644 index 970645b..0000000 --- a/assistant5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:378c6c9ca90cfbf0edfa72fe42a6ad9895c531c68ebf02bf9eb871885fd2f07a -size 2353 diff --git a/designer5.desktop b/designer5.desktop index d636435..67516f0 100644 --- a/designer5.desktop +++ b/designer5.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Categories=Qt;Development;GUIDesigner +Categories=Qt;Development;GUIDesigner; Encoding=UTF-8 Exec=/usr/bin/designer-qt5 Name=Qt 5 Designer diff --git a/designer5.png b/designer5.png deleted file mode 100644 index 5cf55b0..0000000 --- a/designer5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8aa067c8b71658293f8003ff1df3e8d2fe3d1484c739ba6d19c25eed1e044e13 -size 324 diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index fdf9b25..d247de6 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.3.2~git20140904 (rd8bc98b): + * Tip of the bugfix 5.3.2 branch: + * Update copyright year in About dialogs + * fix gaelic plural rules + * Add bearer plugin deployment + * qtpaths: add missing GenericConfigLocation, + exists since Qt 5.2.0 + * Ignore local and non-filesystem qml imports. + * Bump version + +------------------------------------------------------------------- +Mon Sep 1 21:39:42 UTC 2014 - hrvoje.senjan@gmail.com + +- Drop icons from sources, and install them directly from tarball +- Add QDBusViewer desktop file +- Add trailing ';' to desktop files + ------------------------------------------------------------------- Wed Jun 25 10:38:07 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 8014777..3e76147 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -16,31 +16,25 @@ # -%define qt5_snapshot 0 +%define qt5_snapshot 1 Name: libqt5-qttools -Version: 5.3.1 +Version: 5.3.2~git20140904 Release: 0 Summary: Qt 5 QtTools Module License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.3.1 -%define so_version 5.3.1 -%if %qt5_snapshot -%define tar_version qttools-%{real_version} -%else +%define real_version 5.3.2 +%define so_version 5.3.2 %define tar_version qttools-opensource-src-%{real_version} -%endif Source: %{tar_version}.tar.xz Source1: baselibs.conf Source11: designer5.desktop Source12: linguist5.desktop Source13: assistant5.desktop -Source14: assistant5.png -Source15: designer5.png -Source16: linguist5.png +Source14: qdbusviewer5.desktop BuildRequires: fdupes BuildRequires: libQt5WebKitWidgets-devel >= %{version} BuildRequires: libqt5-qtbase-devel >= %{version} @@ -63,11 +57,7 @@ Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. %prep -%if %qt5_snapshot -%setup -q -n qttools-%{real_version} -%else %setup -q -n qttools-opensource-src-%{real_version} -%endif %package devel Summary: Qt Development Kit @@ -202,16 +192,18 @@ for i in * ; do done popd -# -# install menu entries -# +install -D -m644 %{SOURCE11} %{buildroot}%{_datadir}/applications/designer5.desktop +install -D -m644 %{SOURCE12} %{buildroot}%{_datadir}/applications/linguist5.desktop +install -D -m644 %{SOURCE13} %{buildroot}%{_datadir}/applications/assistant5.desktop +install -D -m644 %{SOURCE14} %{buildroot}%{_datadir}/applications/qdbusviewer5.desktop -##%suse_update_desktop_file -i designer5 Qt Development GUIDesigner -##%suse_update_desktop_file -i linguist5 Qt Development Translation -##%suse_update_desktop_file -i assistant5 Qt Development Documentation - -##mkdir -p %{buildroot}%{_datadir}/doc/packages/libqt5 -##cp -a src/assistant/assistant/assistant.qch %{buildroot}%{_datadir}/doc/packages/libqt5/ +install -D -m644 src/assistant/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant5.png +install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant5.png +install -D -m644 src/linguist/linguist/images/icons/linguist-32-32.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/linguist5.png +install -D -m644 src/linguist/linguist/images/icons/linguist-128-32.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/linguist5.png +install -D -m644 src/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer5.png +install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer5.png +install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer5.png %files %defattr(-,root,root,755) @@ -238,8 +230,12 @@ popd %{_libqt5_bindir}/qtpaths* %{_datadir}/applications/assistant5.desktop %{_datadir}/applications/designer5.desktop -%{_datadir}/pixmaps/assistant5.png -%{_datadir}/pixmaps/designer5.png +%{_datadir}/applications/qdbusviewer5.desktop +%dir %{_datadir}/icons/hicolor/* +%dir %{_datadir}/icons/hicolor/*/apps +%{_datadir}/icons/hicolor/*/apps/assistant5.png +%{_datadir}/icons/hicolor/*/apps/designer5.png +%{_datadir}/icons/hicolor/*/apps/qdbusviewer5.png %{_libqt5_libdir}/qt5/plugins/designer %files -n libqt5-linguist @@ -254,7 +250,9 @@ popd %{_libqt5_bindir}/lrelease* %{_libqt5_bindir}/lupdate* %{_datadir}/applications/linguist5.desktop -%{_datadir}/pixmaps/linguist5.png +%dir %{_datadir}/icons/hicolor/* +%dir %{_datadir}/icons/hicolor/*/apps +%{_datadir}/icons/hicolor/*/apps/linguist5.png %files -n libQt5CLucene5 %defattr(-,root,root,755) diff --git a/linguist5.desktop b/linguist5.desktop index ea2d4af..9a59bcb 100644 --- a/linguist5.desktop +++ b/linguist5.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Categories=Qt;Development;Translation +Categories=Qt;Development;Translation; Encoding=UTF-8 Exec=/usr/bin/linguist-qt5 Name=Qt 5 Linguist diff --git a/linguist5.png b/linguist5.png deleted file mode 100644 index a079b4f..0000000 --- a/linguist5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c200b40301f67d4d2d27e868beb20c1ddf408575ade3099efec0f7eba65d1f4b -size 1936 diff --git a/qdbusviewer5.desktop b/qdbusviewer5.desktop new file mode 100644 index 0000000..e22137b --- /dev/null +++ b/qdbusviewer5.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Categories=Qt;Development;Debugger; +Encoding=UTF-8 +Exec=/usr/bin/qdbusviewer-qt5 +Name=Qt 5 D-Bus Viewer +GenericName=D-Bus Debugger +Comment=Introspect D-Bus objects and messages +X-KDE-StartupNotify=true +Terminal=false +Type=Application +Icon=qdbusviewer5 + + diff --git a/qttools-opensource-src-5.3.1.tar.xz b/qttools-opensource-src-5.3.1.tar.xz deleted file mode 100644 index 7439744..0000000 --- a/qttools-opensource-src-5.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edf59eeead3c1d202883c2e6091abd1d40ac37b6e6b0e240b29ab75f86c515a7 -size 8992380 diff --git a/qttools-opensource-src-5.3.2.tar.xz b/qttools-opensource-src-5.3.2.tar.xz new file mode 100644 index 0000000..8ee6a29 --- /dev/null +++ b/qttools-opensource-src-5.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4011f469f886d2211d1941850e2e4842dc152b1e621f532f5f0be1b911cf684b +size 9041744