[remmina-plugins/f15] Revert "remmina-plugins were merged back into remmina in 1.0: wrong branch"
Christoph Wickert
cwickert at fedoraproject.org
Mon Apr 23 13:00:52 UTC 2012
commit 16321c61038df7cd2bd9468153652e7b704170d8
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Mon Apr 23 15:00:32 2012 +0200
Revert "remmina-plugins were merged back into remmina in 1.0: wrong branch"
This reverts commit c395bc2e766372e0f8398973fdb40db3700abd3e.
.gitignore | 2 +
dead.package | 1 -
remmina-plugins-0.9.2-32bpp.patch | 33 +++
...ins-0.9.2-add-another-ssh_seet_fd_towrite.patch | 24 ++
...lugins-0.9.2-fix-libssh-0.5-compatibility.patch | 24 ++
remmina-plugins.spec | 221 ++++++++++++++++++++
sources | 1 +
7 files changed, 305 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6a05ec9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/remmina-plugins-0.8.4.tar.gz
+/remmina-plugins-0.9.2.tar.gz
diff --git a/remmina-plugins-0.9.2-32bpp.patch b/remmina-plugins-0.9.2-32bpp.patch
new file mode 100644
index 0000000..b0a1f22
--- /dev/null
+++ b/remmina-plugins-0.9.2-32bpp.patch
@@ -0,0 +1,33 @@
+diff -dur remmina-plugins-0.9.2.orig/rdp/remminapluginrdp.c remmina-plugins-0.9.2/rdp/remminapluginrdp.c
+--- remmina-plugins-0.9.2.orig/rdp/remminapluginrdp.c 2010-11-13 15:42:54.000000000 +0100
++++ remmina-plugins-0.9.2/rdp/remminapluginrdp.c 2011-01-21 16:27:17.664767702 +0100
+@@ -468,6 +468,7 @@
+ "15", N_("High color (15 bit)"),
+ "16", N_("High color (16 bit)"),
+ "24", N_("True color (24 bit)"),
++ "32", N_("True color (32 bit)"),
+ NULL
+ };
+
+diff -dur remmina-plugins-0.9.2.orig/vnc/remminapluginvnc.c remmina-plugins-0.9.2/vnc/remminapluginvnc.c
+--- remmina-plugins-0.9.2.orig/vnc/remminapluginvnc.c 2011-01-19 05:42:41.000000000 +0100
++++ remmina-plugins-0.9.2/vnc/remminapluginvnc.c 2011-01-21 16:28:25.519277471 +0100
+@@ -1900,6 +1900,7 @@
+ "15", N_("High color (15 bit)"),
+ "16", N_("High color (16 bit)"),
+ "24", N_("True color (24 bit)"),
++ "32", N_("True color (32 bit)"),
+ NULL
+ };
+
+diff -dur remmina-plugins-0.9.2.orig/xdmcp/remminapluginxdmcp.c remmina-plugins-0.9.2/xdmcp/remminapluginxdmcp.c
+--- remmina-plugins-0.9.2.orig/xdmcp/remminapluginxdmcp.c 2010-11-13 15:42:54.000000000 +0100
++++ remmina-plugins-0.9.2/xdmcp/remminapluginxdmcp.c 2011-01-21 16:28:23.470201800 +0100
+@@ -341,6 +341,7 @@
+ "8", N_("256 colors"),
+ "16", N_("High color (16 bit)"),
+ "24", N_("True color (24 bit)"),
++ "32", N_("True color (32 bit)"),
+ NULL
+ };
+
diff --git a/remmina-plugins-0.9.2-add-another-ssh_seet_fd_towrite.patch b/remmina-plugins-0.9.2-add-another-ssh_seet_fd_towrite.patch
new file mode 100644
index 0000000..bc34327
--- /dev/null
+++ b/remmina-plugins-0.9.2-add-another-ssh_seet_fd_towrite.patch
@@ -0,0 +1,24 @@
+From 3f6c309ffabd09ad40c87c922944fe5ad0351a22 Mon Sep 17 00:00:00 2001
+From: Vic Lee <llyzs at 163.com>
+Date: Thu, 1 Sep 2011 15:23:12 +0800
+Subject: [PATCH] NX: add another ssh_seet_fd_towrite.
+
+---
+ remmina-plugins/nx/remminanxsession.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/remmina-plugins/nx/remminanxsession.c b/remmina-plugins/nx/remminanxsession.c
+index 2e57541..37b981d 100644
+--- a/remmina-plugins/nx/remminanxsession.c
++++ b/remmina-plugins/nx/remminanxsession.c
+@@ -840,6 +840,7 @@ remmina_nx_session_tunnel_main_thread (gpointer data)
+ {
+ for (ptr = buffer, lenw = 0; len > 0; len -= lenw, ptr += lenw)
+ {
++ ssh_set_fd_towrite (nx->session);
+ lenw = channel_write (channels[0], (char*) ptr, len);
+ if (lenw <= 0)
+ {
+--
+1.7.4.1
+
diff --git a/remmina-plugins-0.9.2-fix-libssh-0.5-compatibility.patch b/remmina-plugins-0.9.2-fix-libssh-0.5-compatibility.patch
new file mode 100644
index 0000000..78db9c0
--- /dev/null
+++ b/remmina-plugins-0.9.2-fix-libssh-0.5-compatibility.patch
@@ -0,0 +1,24 @@
+From 3a512f55481e3fa579f1556bbb2a6bf566f4f927 Mon Sep 17 00:00:00 2001
+From: Vic Lee <llyzs at 163.com>
+Date: Thu, 1 Sep 2011 15:14:03 +0800
+Subject: [PATCH] nx: fix libssh 0.5 compatibility.
+
+---
+ remmina-plugins/nx/remminanxsession.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/remmina-plugins/nx/remminanxsession.c b/remmina-plugins/nx/remminanxsession.c
+index c702be5..2e57541 100644
+--- a/remmina-plugins/nx/remminanxsession.c
++++ b/remmina-plugins/nx/remminanxsession.c
+@@ -516,6 +516,7 @@ remmina_nx_session_send_command (RemminaNXSession *nx, const gchar *cmdfmt, ...)
+ channel_write (nx->channel, cmd, strlen (cmd));
+ g_free (cmd);
+
++ ssh_set_fd_towrite (nx->session);
+ channel_write (nx->channel, "\n", 1);
+ }
+
+--
+1.7.4.1
+
diff --git a/remmina-plugins.spec b/remmina-plugins.spec
new file mode 100644
index 0000000..2ecafff
--- /dev/null
+++ b/remmina-plugins.spec
@@ -0,0 +1,221 @@
+%global minorversion 0.9
+
+Name: remmina-plugins
+Version: 0.9.2
+Release: 4%{?dist}
+Summary: Plugins for Remmina Remote Desktop Client
+
+Group: Applications/Internet
+License: GPLv2+
+URL: http://remmina.sourceforge.net/
+Source0: http://downloads.sourceforge.net/remmina/%{name}-%{version}.tar.gz
+# from https://bugzilla.redhat.com/show_bug.cgi?id=656120
+Patch0: remmina-plugins-0.9.2-32bpp.patch
+# taken from http://remmina.git.sourceforge.net/git/gitweb.cgi?p=remmina/remmina;a=commit;h=3a512f55
+# fixes https://bugzilla.redhat.com/show_bug.cgi?id=753792
+Patch1: remmina-plugins-0.9.2-fix-libssh-0.5-compatibility.patch
+# Taken from http://remmina.git.sourceforge.net/git/gitweb.cgi?p=remmina/remmina;a=commit;h=3f6c309f
+# fixes https://bugzilla.redhat.com/show_bug.cgi?id=753792
+Patch2: remmina-plugins-0.9.2-add-another-ssh_seet_fd_towrite.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: intltool,
+BuildRequires: gtk2-devel
+BuildRequires: remmina-devel >= %{minorversion}
+BuildRequires: libssh-devel
+BuildRequires: libxkbfile-devel
+
+
+%description
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny netbooks.
+
+Remmina supports multiple network protocols in an integrated and consistent
+user interface. Currently NX, RDP, Telepathy, VNC, XDMCP and SSH are supported.
+
+This package contains the plugins for Remmina.
+
+
+%package common
+Summary: Common files for Remmina Remote Desktop Client plugins
+Group: Applications/System
+Requires: remmina >= 0.9
+
+%description common
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny netbooks.
+
+This package contains files shared among all plugins for the Remmina remote
+desktop client.
+
+
+%package nx
+Summary: NX plugin for Remmina Remote Desktop Client
+Group: Applications/System
+Requires: %{name}-common = %{version}-%{release}
+Requires: nx
+
+%description nx
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny netbooks.
+
+This package contains the NX plugin for the Remmina remote desktop client.
+
+
+%package rdp
+Summary: RDP plugin for Remmina Remote Desktop Client
+Group: Applications/System
+BuildRequires: freerdp-devel
+Requires: %{name}-common = %{version}-%{release}
+Requires: freerdp
+
+%description rdp
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny netbooks.
+
+This package contains the Remote Desktop Protocol (RDP) plugin for the Remmina
+remote desktop client.
+
+
+%package telepathy
+Summary: Telepathy plugin for Remmina Remote Desktop Client
+Group: Applications/System
+BuildRequires: telepathy-glib-devel
+Requires: %{name}-common = %{version}-%{release}
+
+%description telepathy
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny netbooks.
+
+This package contains the Telepathy plugin for the Remmina remote desktop
+client.
+
+
+%package vnc
+Summary: VNC plugin for Remmina Remote Desktop Client
+Group: Applications/System
+BuildRequires: gnutls-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libvncserver-devel
+Requires: %{name}-common = %{version}-%{release}
+
+%description vnc
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny netbooks.
+
+This package contains the VNC plugin for the Remmina remote desktop
+client.
+
+
+%package xdmcp
+Summary: XDMCP plugin for Remmina Remote Desktop Client
+Group: Applications/System
+Requires: %{name}-common = %{version}-%{release}
+Requires: xorg-x11-server-Xephyr
+
+%description xdmcp
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny netbooks.
+
+This package contains the XDMCP plugin for the Remmina remote desktop
+client.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .32bpp
+
+%if 0%{?fedora} >= 16
+%patch1 -p2 -b .fix-libssh-0.5-compatibility
+%patch2 -p2 -b .add-another-ssh_seet_fd_towrite
+%endif
+
+
+%build
+%configure --disable-static --enable-vnc=dl
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%find_lang %{name}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files common -f %{name}.lang
+%defattr(-,root,root,-)
+# FIXME: Add ChangeLog, NEWS and README if not empty
+%doc AUTHORS COPYING
+%dir %{_libdir}/remmina/
+%dir %{_libdir}/remmina/plugins/
+
+%files nx
+%defattr(-,root,root,-)
+%{_libdir}/remmina/plugins/remmina-plugin-nx.so
+%{_datadir}/remmina/icons/hicolor/*/emblems/remmina-nx.png
+
+%files rdp
+%defattr(-,root,root,-)
+%{_libdir}/remmina/plugins/remmina-plugin-rdp.so
+%{_datadir}/remmina/icons/hicolor/*/emblems/remmina-rdp-ssh.png
+%{_datadir}/remmina/icons/hicolor/*/emblems/remmina-rdp.png
+
+%files telepathy
+%defattr(-,root,root,-)
+%{_libdir}/remmina/plugins/remmina-plugin-telepathy.so
+%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Remmina.service
+%{_datadir}/telepathy/clients/Remmina.client
+
+%files vnc
+%defattr(-,root,root,-)
+%{_libdir}/remmina/plugins/remmina-plugin-vnc.so
+%{_datadir}/remmina/icons/hicolor/*/emblems/remmina-vnc-ssh.png
+%{_datadir}/remmina/icons/hicolor/*/emblems/remmina-vnc.png
+
+%files xdmcp
+%defattr(-,root,root,-)
+%{_libdir}/remmina/plugins/remmina-plugin-xdmcp.so
+%{_datadir}/remmina/icons/hicolor/*/emblems/remmina-xdmcp-ssh.png
+%{_datadir}/remmina/icons/hicolor/*/emblems/remmina-xdmcp.png
+
+
+%changelog
+* Sat Dec 31 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-4
+- Fix nx plugin (#753792)
+- Rebuild against libvncserver 0.9.8.2
+
+* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.9.2-3
+- Rebuild for new libpng
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Jan 19 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-1
+- Update to 0.9.2
+- Enable 32-bit color depth (#656120)
+
+* Tue Nov 30 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-2
+- Fix dependencies for remmina-plugins-common package
+- Rename plugins packages to remmina-plugins-* for consistency.
+
+* Sun Nov 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
+- Update to 0.8.4
+
+* Mon Jul 12 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.1-1
+- Update to 0.8.1
+
+* Fri Jun 25 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.99-1
+- Initial package
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..c9f4402
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+6f6b7cb18f7604f3f17eeda5173ede6a remmina-plugins-0.9.2.tar.gz
More information about the scm-commits
mailing list