From 30f044ff08fe7cfda4308b3f61a6e4a00e745456 Mon Sep 17 00:00:00 2001 From: Aurelien Bompard Date: Mar 30 2009 06:36:15 +0000 Subject: - fix bug 485009 - install the desktop file with desktop-file-install --- diff --git a/ksshaskpass-0.5.1-desktopfile.patch b/ksshaskpass-0.5.1-desktopfile.patch new file mode 100644 index 0000000..19935c3 --- /dev/null +++ b/ksshaskpass-0.5.1-desktopfile.patch @@ -0,0 +1,21 @@ +diff -up ksshaskpass-0.5.1/src/ksshaskpass.desktop~ ksshaskpass-0.5.1/src/ksshaskpass.desktop +--- ksshaskpass-0.5.1/src/ksshaskpass.desktop~ 2008-11-25 23:46:22.000000000 +0200 ++++ ksshaskpass-0.5.1/src/ksshaskpass.desktop 2009-03-29 23:47:20.000000000 +0300 +@@ -1,12 +1,12 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 +-Name=SSH AskPass +-GenericName=ssh-add +-Comment=Enter passphrase to authenticate to the ssh agent ++Name=Ksshaskpass ++GenericName=SSH agent identity adder ++Comment=Add identities to the SSH authentication agent + Exec=/usr/bin/ssh-add + TryExec=ssh-add + Terminal=false + Type=Application +-Icon=ssh-askpass-gnome ++Icon=dialog-password + Categories=Network;Security; ++OnlyShowIn=KDE diff --git a/ksshaskpass.spec b/ksshaskpass.spec index 9578ccc..4e75650 100644 --- a/ksshaskpass.spec +++ b/ksshaskpass.spec @@ -1,6 +1,6 @@ Name: ksshaskpass Version: 0.5.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: A KDE version of ssh-askpass with KWallet support Group: Applications/Internet @@ -8,9 +8,10 @@ License: GPLv2 URL: http://www.kde-apps.org/content/show.php?content=50971 Source0: http://www.kde-apps.org/CONTENT/content-files/50971-ksshaskpass-%{version}.tar.gz Source1: ksshaskpass-README.Fedora +Patch0: ksshaskpass-0.5.1-desktopfile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, cmake +BuildRequires: kdelibs-devel cmake desktop-file-utils #Requires: openssh-clients %description @@ -22,6 +23,7 @@ instructions %prep %setup -q +%patch0 -p1 -b .desktopfile cp -p %{SOURCE1} README.Fedora @@ -41,6 +43,10 @@ SSH_ASKPASS=%{_bindir}/ksshaskpass export SSH_ASKPASS EOF +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \ + src/%{name}.desktop + # Remove *.la files find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' @@ -59,6 +65,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 30 2009 Aurelien Bompard 0.5.1-3 +- fix bug 485009 +- install the desktop file with desktop-file-install + +* Wed Feb 25 2009 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Nov 30 2008 Aurelien Bompard 0.5.1-1 - version 0.5.1