[lxqt-openssh-askpass] - Unify naming as discussed on Fedora IRC

Helio Chissini de Castro heliocastro at fedoraproject.org
Sat Dec 20 15:38:06 UTC 2014


commit 1ef4eec33de8d7a39c679fbd49c607484ce36ecf
Author: Helio Chissini de Castro <helio at kde.org>
Date:   Sat Dec 20 13:37:59 2014 -0200

    - Unify naming as discussed on Fedora IRC

 .gitignore                             |    1 +
 lxqt-openssh-askpass-0.8.0-unify.patch |   23 +++++++++++
 lxqt-openssh-askpass.csh               |    1 +
 lxqt-openssh-askpass.sh                |    2 +
 lxqt-openssh-askpass.spec              |   64 ++++++++++++++++++++++++++++++++
 sources                                |    1 +
 6 files changed, 92 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..0e96bab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/lxqt-openssh-askpass-0.8.0.tar.xz
diff --git a/lxqt-openssh-askpass-0.8.0-unify.patch b/lxqt-openssh-askpass-0.8.0-unify.patch
new file mode 100644
index 0000000..69e03f0
--- /dev/null
+++ b/lxqt-openssh-askpass-0.8.0-unify.patch
@@ -0,0 +1,23 @@
+--- lxqt-openssh-askpass-0.8.0/CMakeLists.txt.unify	2014-12-20 13:33:24.338722123 -0200
++++ lxqt-openssh-askpass-0.8.0/CMakeLists.txt	2014-12-20 13:33:55.138833834 -0200
+@@ -15,19 +15,15 @@
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ 
+ option(USE_QT5 "Build with Qt5." $ENV{USE_QT5})
++find_package(LXQT REQUIRED)
+ if(USE_QT5)
+     find_package(Qt5Widgets REQUIRED QUIET)
+     find_package(Qt5LinguistTools REQUIRED QUIET)
+-
+-    find_package(lxqt-qt5 REQUIRED QUIET)
+-
+     set(QTX_INCLUDE_DIRS ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR})
+     set(QTX_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+ else()
+     find_package(Qt4 REQUIRED)
+     include(${QT_USE_FILE})
+-
+-    find_package(LXQT REQUIRED)
+     set(QTX_INCLUDE_DIRS ${Qt4Widgets_INCLUDE_DIR})
+     set(QTX_LIBRARIES ${Qt4Widgets_LIBRARY})
+ endif()
diff --git a/lxqt-openssh-askpass.csh b/lxqt-openssh-askpass.csh
new file mode 100644
index 0000000..65672d2
--- /dev/null
+++ b/lxqt-openssh-askpass.csh
@@ -0,0 +1 @@
+setenv SSH_ASKPASS /usr/libexec/openssh/lxqt-openssh-askpass
diff --git a/lxqt-openssh-askpass.sh b/lxqt-openssh-askpass.sh
new file mode 100644
index 0000000..7759e15
--- /dev/null
+++ b/lxqt-openssh-askpass.sh
@@ -0,0 +1,2 @@
+SSH_ASKPASS=/usr/libexec/openssh/lxqt-openssh-askpass
+export SSH_ASKPASS
diff --git a/lxqt-openssh-askpass.spec b/lxqt-openssh-askpass.spec
new file mode 100644
index 0000000..5fb7506
--- /dev/null
+++ b/lxqt-openssh-askpass.spec
@@ -0,0 +1,64 @@
+%if 0%{?rhel} == 6
+%define cmake_pkg cmake28
+%else
+%define cmake_pkg cmake
+%endif
+
+Name:    lxqt-openssh-askpass
+Summary: Askpass openssh transition dialog for LXQt desktop suite
+Version: 0.8.0
+Release: 4%{?dist}
+License: LGPLv2+
+URL:     http://lxqt.org/
+Source0: http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz
+Source1: lxqt-openssh-askpass.sh
+Source2: lxqt-openssh-askpass.csh
+Patch0:  lxqt-openssh-askpass-0.8.0-unify.patch
+
+BuildRequires:  %{cmake_pkg} >= 2.8.9
+BuildRequires: pkgconfig(Qt5Help)
+BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0
+BuildRequires: pkgconfig(lxqt)
+
+%description
+%{summary}.
+
+%prep
+%setup
+%patch0 -p1 -b .unify
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{?cmake28}%{!?cmake28:%{?cmake}} -DUSE_QT5=TRUE ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+mkdir -p %{buildroot}%{_libexecdir}/openssh/
+mv %{buildroot}/%{_bindir}/lxqt-openssh-askpass %{buildroot}%{_libexecdir}/openssh/
+
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+install -p -m0755 %SOURCE1 %SOURCE2 %{buildroot}%{_sysconfdir}/profile.d/
+
+%files
+%doc COPYING
+%{_libexecdir}/openssh/lxqt-openssh-askpass
+%config(noreplace) %{_sysconfdir}/profile.d/*
+
+
+%changelog
+* Sat Dec 20 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-4
+- Unify naming as discussed on Fedora IRC
+
+* Mon Nov 10 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-3
+- Update for review in https://bugzilla.redhat.com/show_bug.cgi?id=1159829 
+
+* Mon Nov 03 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-2
+- Update to push on fedora review
+
+* Mon Oct 27 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-1
+- First release to LxQt new base
diff --git a/sources b/sources
index e69de29..ce14ff7 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+74e0fd9f684b4e855ea1c5accbd64d10  lxqt-openssh-askpass-0.8.0.tar.xz


More information about the scm-commits mailing list