From 9bcffd74ab067f1245cc078dc1234c5f8eff9638 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Fri, 21 Jan 2011 18:42:51 +0100
Subject: [PATCH] - Update to 0.9.3

---
 .gitignore                |  1 +
 remmina-0.7.5-32bpp.patch | 18 -------------
 remmina.spec              | 57 ++++++++++++++++++++++++++++++---------
 sources                   |  2 +-
 4 files changed, 47 insertions(+), 31 deletions(-)
 delete mode 100644 remmina-0.7.5-32bpp.patch

diff --git a/.gitignore b/.gitignore
index 0cc2e1b..f955bda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 remmina-0.7.5.tar.gz
+/remmina-0.9.3.tar.gz
diff --git a/remmina-0.7.5-32bpp.patch b/remmina-0.7.5-32bpp.patch
deleted file mode 100644
index 3107350..0000000
--- a/remmina-0.7.5-32bpp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- remmina-0.7.5/src/remminafile.c.orig	2010-11-23 09:17:25.774867000 +0500
-+++ remmina-0.7.5/src/remminafile.c	2010-11-23 09:16:54.360867001 +0500
-@@ -37,6 +37,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
- };
- 
-@@ -47,6 +48,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.spec b/remmina.spec
index 6f291b0..e229c37 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -1,25 +1,35 @@
 Name:           remmina
-Version:        0.7.5
-Release:        3%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Remote Desktop Client
 
 Group:          Applications/Internet
 License:        GPLv2+ and MIT
 URL:            http://remmina.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         remmina-0.7.5-32bpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  intltool, gtk2-devel, libvncserver-devel
-BuildRequires:  libjpeg-devel, gnutls-devel, libssh-devel 
-BuildRequires:  avahi-ui-devel, vte-devel, unique-devel
-BuildRequires:  gettext, desktop-file-utils      
-
-Requires:       rdesktop, xorg-x11-server-Xephyr
-
+BuildRequires:  gtk2-devel
+BuildRequires:  libssh-devel
+BuildRequires:  libgcrypt-devel
+BuildRequires:  avahi-ui-devel
+BuildRequires:  vte-devel
+BuildRequires:  unique-devel
+BuildRequires:  gettext
+BuildRequires:  intltool
+BuildRequires:  desktop-file-utils      
+
+# Remmina used to be called grdc
 Provides:       grdc = %{version}
 Obsoletes:      grdc < 0.6.1
 
+# Remmina has a generic trayicon now
+Provides:       gnome-applet-remmina = %{version}
+Provides:       xfce4-remmina-plugin = %{version}
+Obsoletes:      gnome-applet-remmina < 0.7.3
+Obsoletes:      xfce4-remmina-plugin < 0.7.3
+
+
 %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 
@@ -28,14 +38,25 @@ computers in front of either large monitors or tiny netbooks.
 Remmina supports multiple network protocols in an integrated and consistent
 user interface. Currently RDP, VNC, XDMCP and SSH are supported.
 
+Please don't forget to install the plugins for the protocols you want to use.
+
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains header files for developing plugins for 
+%{name}.
+
 
 %prep
 %setup -q
-%patch0 -p1 -b .32bpp
 
 
 %build
-%configure --enable-vnc=dl
+%configure
 make %{?_smp_mflags}
 
 
@@ -77,7 +98,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/%{name}/
 
+%files devel
+%defattr(-,root,root,-)
+%doc
+%{_includedir}/%{name}/
+
 %changelog
+* Wed Jan 19 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.9.3-1
+- Update to 0.9.3
+
+* Sun Nov 28 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.8.3-1
+- Update to 0.8.3
+- Plugins are in remmina-plugins now
+
 * Sat Nov 27 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.7.5-3
 - Enable 32-bit color depth (#656120)
 
diff --git a/sources b/sources
index 13b55e0..ba957cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b787672b63c57ca9323072f1304ef10  remmina-0.7.5.tar.gz
+c87004a70ec62acbae732e8d47f71ba7  remmina-0.9.3.tar.gz