From a6377b8cdb729058ec608c2a26d8439f91026bf8 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Aug 31 2006 12:34:35 +0000
Subject: add missing desktop files


---

diff --git a/assistant3.desktop b/assistant3.desktop
new file mode 100644
index 0000000..4f4c3c2
--- /dev/null
+++ b/assistant3.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt3 Assistant 
+Comment=Add translations to Qt3 applications
+Exec=assistant
+Icon=assistant3
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Application;Development;
diff --git a/designer3.desktop b/designer3.desktop
index 6329586..56b03e8 100644
--- a/designer3.desktop
+++ b/designer3.desktop
@@ -3,7 +3,7 @@ Name=Qt3 Designer
 GenericName=Interface Designer
 Comment=Design GUIs for Qt3 applications
 Exec=designer
-Icon=designer
+Icon=designer3
 MimeType=application/x-designer;
 Terminal=false
 Encoding=UTF-8
diff --git a/linguist3.desktop b/linguist3.desktop
new file mode 100644
index 0000000..be64891
--- /dev/null
+++ b/linguist3.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt3 Linguist 
+Comment=Add translations to Qt3 applications
+Exec=linguist
+Icon=linguist3
+MimeType=application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Application;Development;
diff --git a/qt.spec b/qt.spec
index fb6567f..7c6ff73 100644
--- a/qt.spec
+++ b/qt.spec
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.6
-Release: 12
+Release: 13
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -11,6 +11,9 @@ Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.bz2
 Source2: qt.sh
 Source3: qt.csh
 Source4: designer3.desktop
+Source5: assistant3.desktop
+Source6: linguist3.desktop
+Source7: qtconfig3.desktop
 
 Patch1: qt-3.3.4-print-CJK.patch
 Patch2: qt-3.0.5-nodebug.patch
@@ -73,8 +76,7 @@ Requires: fileutils
 Requires: fontconfig >= 2.0
 Requires: /etc/ld.so.conf.d
 
-BuildRequires: gcc-c++
-BuildRequires: libstdc++-devel
+BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
 BuildRequires: glibc-devel
 BuildRequires: libjpeg-devel
@@ -400,9 +402,13 @@ done
 mkdir -p %{buildroot}/etc/profile.d
 install -m 755 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
 
-# Add desktop file
+# Add desktop files
 mkdir -p %{buildroot}%{_datadir}/applications
-install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}-designer.desktop
+desktop-file-install \
+  --dir %{buildroot}%{_datadir}/applications \
+  --vendor="%{name}" \
+  --add-category="X-Fedora" \
+  %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
 
 # Patch qmake to use qt-mt unconditionally
 perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf
@@ -414,6 +420,13 @@ rm -f %{buildroot}%{qtdir}/lib/*.la
 mkdir -p %{buildroot}/etc/ld.so.conf.d
 echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf
 
+# install icons
+mkdir %{buildroot}%{_datadir}/pixmaps
+install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png
+install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png
+install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png
+install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png
+
 %clean
 rm -rf %{buildroot}
 
@@ -438,6 +451,8 @@ rm -rf %{buildroot}
 %files config
 %defattr(-,root,root,-)
 %{qtdir}/bin/qtconfig
+%{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/pixmaps/qtconfig3.png
 
 %files devel
 %defattr(-,root,root,-)
@@ -465,6 +480,10 @@ rm -rf %{buildroot}
 %{qtdir}/translations
 %{qtdir}/phrasebooks
 %{_libdir}/pkgconfig/*
+%{_datadir}/applications/*linguist*.desktop
+%{_datadir}/applications/*assistant*.desktop
+%{_datadir}/pixmaps/linguist3.png
+%{_datadir}/pixmaps/assistant3.png
 
 %files devel-docs
 %defattr(-,root,root,-)
@@ -491,10 +510,14 @@ rm -rf %{buildroot}
 %{qtdir}/templates
 %{qtdir}/plugins/designer/*
 %{qtdir}/bin/designer
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/*designer*.desktop
+%{_datadir}/pixmaps/designer3.png
 
 
 %changelog
+* Thu Aug 31 2006 Than Ngo <than@redhat.com> 1:3.3.6-13
+- add missing desktop files
+
 * Mon Jul 17 2006 Than Ngo <than@redhat.com> 1:3.3.6-12
 - rebuild
 
diff --git a/qtconfig3.desktop b/qtconfig3.desktop
new file mode 100644
index 0000000..01d635d
--- /dev/null
+++ b/qtconfig3.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt3 Config 
+Comment=Configure Qt3 behavior, styles, fonts
+Exec=qtconfig
+Icon=qtconfig3
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Application;AdvancedSettings;Settings;