From 8a2737ee6db6bde5408945a76cc3be1f19e82c40 Mon Sep 17 00:00:00 2001 From: "Steven M. Parrish" Date: Mon, 29 Dec 2008 15:36:36 +0000 Subject: [PATCH] Fix for bug 477850 --- quassel.desktop | 2 +- quassel.png | Bin 0 -> 4694 bytes quassel.spec | 10 +++++++++- quasselclient.desktop | 2 +- quasselcore.desktop | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 quassel.png diff --git a/quassel.desktop b/quassel.desktop index 7f13157..8842eba 100644 --- a/quassel.desktop +++ b/quassel.desktop @@ -3,7 +3,7 @@ Version=1.0 Encoding=UTF-8 Name=Quassel IRC Exec=quassel -Icon=default +Icon=quassel Terminal=false Type=Application Categories=Qt;Network;IRCClient; diff --git a/quassel.png b/quassel.png new file mode 100644 index 0000000000000000000000000000000000000000..941a0d877749db7f26bb93609f72c2f96648ff3e GIT binary patch literal 4694 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 Y10=%XRnr7)@c;k-07*qoM6N<$f`LvE?*IS* literal 0 HcmV?d00001 diff --git a/quassel.spec b/quassel.spec index 16a6e01..4ff65ee 100755 --- a/quassel.spec +++ b/quassel.spec @@ -1,7 +1,7 @@ Name: quassel Summary: QT4 Based distrubuted IRC system Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or GPLv3 Group: Applications/Internet @@ -10,6 +10,7 @@ Source0: http://quassel-irc.org/system/files/quassel-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}core.desktop Source3: %{name}client.desktop +Source4: %{name}.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: qt-sqlite, openssl @@ -54,6 +55,7 @@ install -d -m755 %{buildroot}%{_bindir} install -m755 quassel %{buildroot}%{_bindir} install -m755 quasselclient %{buildroot}%{_bindir} install -m755 quasselcore %{buildroot}%{_bindir} +%{__install} -p -D %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} @@ -67,20 +69,26 @@ rm -rf %{buildroot} %attr(755,root,root) %{_bindir}/quassel %doc COPYING gpl-2.0.txt gpl-3.0.txt README %{_datadir}/applications/fedora-quassel.desktop +%attr(644,root,root) %{_datadir}/pixmaps/quassel.png %files core %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/quasselcore %doc COPYING gpl-2.0.txt gpl-3.0.txt README %{_datadir}/applications/fedora-quasselcore.desktop +%attr(644,root,root) %{_datadir}/pixmaps/quassel.png %files client %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/quasselclient %doc COPYING gpl-2.0.txt gpl-3.0.txt README %{_datadir}/applications/fedora-quasselclient.desktop +%attr(644,root,root) %{_datadir}/pixmaps/quassel.png %changelog +* Mon Dec 29 2008 Steven M. Parrish 0.3.1-2 +- Fix bug #477850 + * Fri Nov 28 2008 Steven M. Parrish 0.3.1-1 - New upstream release diff --git a/quasselclient.desktop b/quasselclient.desktop index c022d06..497ca37 100644 --- a/quasselclient.desktop +++ b/quasselclient.desktop @@ -3,7 +3,7 @@ Version=1.0 Encoding=UTF-8 Name=Quassel client Exec=quasselclient -Icon=default +Icon=quassel Terminal=false Type=Application Categories=Qt;Network;IRCClient; diff --git a/quasselcore.desktop b/quasselcore.desktop index e130ea8..a33435d 100644 --- a/quasselcore.desktop +++ b/quasselcore.desktop @@ -3,7 +3,7 @@ Version=1.0 Encoding=UTF-8 Name=Quassel IRC Core Exec=quasselcore -Icon=default +Icon=quassel Terminal=false Type=Application Categories=Qt;Network;IRCClient;