diff --git a/.gitignore b/.gitignore index 22087f3..c2cc130 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -50971-ksshaskpass-0.5.3.tar.gz +/ksshaskpass-5.2.0.tar.xz diff --git a/ksshaskpass-0.5.1-desktopfile.patch b/ksshaskpass-0.5.1-desktopfile.patch deleted file mode 100644 index 19935c3..0000000 --- a/ksshaskpass-0.5.1-desktopfile.patch +++ /dev/null @@ -1,21 +0,0 @@ -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-README.Fedora b/ksshaskpass-README.Fedora deleted file mode 100644 index eaf9467..0000000 --- a/ksshaskpass-README.Fedora +++ /dev/null @@ -1,18 +0,0 @@ -KSSHAskpass ------------ - -This is a KWallet-enabled ssh-askpass application. -It allows you to add identities to the ssh-agent -while storing the passphrases in KWallet. - -To enable it, just create a script like this: --------------------------------- -#!/bin/sh -SSH_ASKPASS=/usr/bin/ksshaskpass -export SSH_ASKPASS -exec ssh-add --------------------------------- -put it in ~/.kde/Autostart/ and make it executable. - -Next time you login, ssh-add will use ksshaskpass -as a password entry front-end. diff --git a/ksshaskpass.spec b/ksshaskpass.spec index 2dd7b21..4104373 100644 --- a/ksshaskpass.spec +++ b/ksshaskpass.spec @@ -1,70 +1,75 @@ Name: ksshaskpass -Version: 0.5.3 -Release: 9%{?dist} -Summary: A KDE version of ssh-askpass with KWallet support +Version: 5.2.0 +Release: 1%{?dist} +Summary: A ssh-add helper that uses kwallet and kpassworddialog -Group: Applications/Internet 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 desktop-file-utils -#Requires: openssh-clients +URL: https://projects.kde.org/projects/kde/workspace/ksshaskpass +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz + +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: extra-cmake-modules +BuildRequires: gettext +BuildRequires: kf5-rpm-macros +BuildRequires: kf5-kcoreaddons-devel +BuildRequires: kf5-kdoctools-devel +BuildRequires: kf5-ki18n-devel +BuildRequires: kf5-kwidgetsaddons-devel +BuildRequires: kf5-kwallet-devel +BuildRequires: pkgconfig(Qt5Core) %description %{summary}. -Please read %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/README.Fedora for usage -instructions - %prep %setup -q -%patch0 -p1 -b .desktopfile -cp -p %{SOURCE1} README.Fedora %build -%cmake -DCMAKE_SKIP_RPATH:BOOL=YES . -make VERBOSE=1 %{?_smp_mflags} +mkdir %{_target_platform} +pushd %{_target_platform} +%{cmake_kf5} .. +popd +make %{?_smp_mflags} -C %{_target_platform} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + +%find_lang ksshaskpass # Setup environment variables -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/ -cat > $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/ksshaskpass.sh << EOF -SSH_ASKPASS=%{_bindir}/ksshaskpass +mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/ +cat > %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/ksshaskpass.sh << EOF +SSH_ASKPASS=%{_kf5_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 {} ';' +%check +desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.ksshaskpass.desktop -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc ChangeLog COPYING README.Fedora -%{_bindir}/ksshaskpass -%config(noreplace) %{_sysconfdir}/kde/env/ksshaskpass.* -%{_mandir}/*/*.gz -%{_datadir}/applications/kde4/*.desktop +%files -f ksshaskpass.lang +%doc ChangeLog COPYING +%{_kf5_bindir}/ksshaskpass +%config(noreplace) %{_sysconfdir}/xdg/plasma-workspace/env/ksshaskpass.sh +%{_mandir}/man1/ksshaskpass.1* +%{_kf5_datadir}/applications/org.kde.ksshaskpass.desktop %changelog +* Fri Jan 30 2015 Rex Dieter 5.2.0-1 +- ksshaskpass-5.2.0 (#1167480) + * Sun Aug 17 2014 Fedora Release Engineering - 0.5.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 1c174e4..9abd7ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05dad7745e9d92b08bd86e7ab7a9540d 50971-ksshaskpass-0.5.3.tar.gz +1a95a3e40ad05ea977c836df109fd7ca ksshaskpass-5.2.0.tar.xz