Mailinglist Archive: opensuse-commit (941 mails)
| < Previous | Next > |
commit remmina for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 12 Apr 2012 09:49:08 +0200
- Message-id: <20120412074908.C7BE220227@hilbert.suse.de>
Hello community,
here is the log from the commit of package remmina for openSUSE:Factory checked
in at 2012-04-12 09:49:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/remmina (Old)
and /work/SRC/openSUSE:Factory/.remmina.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "remmina", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/remmina/remmina.changes 2011-10-13
12:41:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.remmina.new/remmina.changes 2012-04-12
09:49:06.000000000 +0200
@@ -1,0 +2,42 @@
+Mon Apr 2 19:05:16 UTC 2012 - gber@xxxxxxxxxxxx
+
+- use original tarball name to fix download check
+
+-------------------------------------------------------------------
+Mon Apr 2 13:17:49 UTC 2012 - gber@xxxxxxxxxxxx
+
+- disable the NX plugin by default
+
+-------------------------------------------------------------------
+Wed Mar 28 13:53:10 UTC 2012 - gber@xxxxxxxxxxxx
+
+- added separare patch remmina-fix-install-paths.patch in order to
+ fix the installation paths
+- specfile cleanup
+- removed remmina-plugins-common, now provided by the main package
+- split off -lang subpackage
+
+-------------------------------------------------------------------
+Wed Mar 21 23:00:28 UTC 2012 - gankov@xxxxxxxxxxxx
+
+- rewrote spec for using cmake
+- merged with remmina-plugins into one source package (upstream
+ now diestributes a single tarball with plugins)
+- update to version 1.0.0
+ + Main program design and functionality:
+ * Switch to the CMake build system
+ * Refactoring of code style
+ * Changing file name convention
+ + RDP protocol related:
+ * Support for FreeRDP 1.0
+ * Support for RemoteFX
+ * Support for Network Level Authentication
+ * Added certificate validation prompt
+- added remmina-fix-linker-issue.patch which fixes a linking issue
+ (backport from upstream git)
+- added remmina-fix-desktop-file.patch which fixes the installation
+ of the .desktop file (backport from upstream git)
+- added remmina-gtk-2-22-support.patch in order to build on
+ openSUSE 11.4 with GTK 2.22 as upstream requires 2.24+
+
+-------------------------------------------------------------------
Old:
----
remmina-0.9.3.tar.gz
New:
----
Remmina-1.0.0.tar.gz
remmina-fix-desktop-file.patch
remmina-fix-install-paths.patch
remmina-fix-linker-issue.patch
remmina-gtk-2-22-support.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ remmina.spec ++++++
--- /var/tmp/diff_new_pack.imJSrr/_old 2012-04-12 09:49:08.000000000 +0200
+++ /var/tmp/diff_new_pack.imJSrr/_new 2012-04-12 09:49:08.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package remmina
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,28 +12,59 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+%bcond_with nx
+
Name: remmina
-Version: 0.9.3
-Release: 1
-License: GPL-2.0+
+Version: 1.0.0
+Release: 0
Summary: Versatile Remote Desktop Client
-Url: http://remmina.sourceforge.net/
+License: GPL-2.0+
Group: Productivity/Networking/Other
-Source0:
http://downloads.sourceforge.net/project/remmina/0.9/%{name}-%{version}.tar.gz
+Url: http://remmina.sourceforge.net/
+Source0:
https://github.com/downloads/FreeRDP/Remmina/Remmina-%{version}.tar.gz
Source1: README.SuSE
-BuildRequires: fdupes
+# PATCH-FIX-UPSTREAM remmina-fix-linker-issue.patch gankov@xxxxxxxxxxxx --
Fixes linking issue (backport from upstream git)
+Patch0: remmina-fix-linker-issue.patch
+# PATCH-FIX-UPSTREAM remmina-fix-desktop-file.patch gber@xxxxxxxxxxxx -- Fixes
the installation of the .desktop file (backport from upstream git)
+Patch1: remmina-fix-desktop-file.patch
+# PATCH-FIX-UPSTREAM remmina-fix-install-paths.patch gber@xxxxxxxxxxxx --
Installs plugins under %%{_libdir} (backport from upstream git)
+Patch2: remmina-fix-install-paths.patch
+# PATCH-FIX-UPSTREAM remmina-gtk-2-22-support.patch gankov@xxxxxxxxxxxx --
Build on openSUSE 11.4 with GTK 2.22 as upstream requires 2.24+
+Patch3: remmina-gtk-2-22-support.patch
+BuildRequires: cmake
+BuildRequires: ed
BuildRequires: intltool
-BuildRequires: update-desktop-files
+BuildRequires: libgcrypt-devel
+BuildRequires: libjpeg-devel
BuildRequires: libssh-devel
+BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(avahi-glib)
+BuildRequires: pkgconfig(cairo)
+BuildRequires: pkgconfig(freerdp) >= 1.0
+BuildRequires: pkgconfig(gdk-pixbuf-2.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gnome-keyring-1)
+BuildRequires: pkgconfig(gnutls)
+BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(telepathy-glib)
BuildRequires: pkgconfig(unique-1.0)
+BuildRequires: pkgconfig(xkbfile)
+%if 0%{?suse_version} >= 1210
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(vte-2.90)
+%else
+BuildRequires: pkgconfig(gdk-x11-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(vte)
-BuildRequires: libgcrypt-devel
+%endif
+Provides: remmina-plugins-common = %{version}
+Obsoletes: remmina-plugins-common < 1.0.0
+Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -47,37 +78,105 @@
Summary: Development Files for %{name}
Group: Development/Libraries/Other
Requires: %{name} = %{version}
-Requires: libgcrypt-devel
-Requires: libssh-devel
-Requires: pkgconfig(avahi-glib)
-Requires: pkgconfig(gtk+-2.0)
-Requires: pkgconfig(unique-1.0)
-Requires: pkgconfig(vte)
%description devel
This package contains header files needed for developing plugins for
Remmina.
+%package -n remmina-plugin-xdmcp
+Summary: XDMCP Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+# for Xephyr
+Requires: xorg-x11-server-extra
+
+%description -n remmina-plugin-xdmcp
+This package provides the XDMCP protocol plugin for Remmina.
+
+%if %{with nx}
+%package -n remmina-plugin-nx
+Summary: NX Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+# for nxproxy
+Requires: NX
+
+%description -n remmina-plugin-nx
+This package provides the NX protocol plugin for Remmina.
+%endif
+
+%package -n remmina-plugin-rdp
+Summary: RDP Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: freerdp
+Requires: remmina >= %{version}
+
+%description -n remmina-plugin-rdp
+This package provides the RDP protocol plugin for Remmina.
+
+%package -n remmina-plugin-vnc
+Summary: VNC Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+
+%description -n remmina-plugin-vnc
+This package provides the RDP protocol plugin for Remmina.
+
+%package -n remmina-plugin-telepathy
+Summary: Telepathy Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+
+%description -n remmina-plugin-telepathy
+This package provides the Telepathy plugin for Remmina.
+
+%package -n remmina-plugins-gnome
+Summary: GNOME Plugins for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+
+%description -n remmina-plugins-gnome
+This package provides the GNOME plugins for Remmina.
+
+%lang_package
+
%prep
-%setup -q
+%setup -q -n FreeRDP-Remmina-356c033
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
cp -r %{SOURCE1} README.SuSE
%build
-%configure
-make %{?_smp_mflags}
+mkdir build
+cd build
+export CFLAGS="%{optflags}"
+cmake \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DCMAKE_INSTALL_LIBDIR=%{_lib} \
+ -DWITH_APPINDICATOR=OFF \
+ ..
-%install
-%make_install
+make %{?_smp_mflags} VERBOSE=1
-%if 0%{?suse_version}
-%suse_update_desktop_file -i %{name} Network RemoteAccess
+%install
+(
+ cd build
+ %make_install
+)
+
+%if %{without nx}
+rm -f %{buildroot}%{_libdir}/remmina/plugins/remmina-plugin-nx.so \
+ %{buildroot}%{_datadir}/icons/hicolor/*/emblems/remmina-nx.png
%endif
-%find_lang %{name}
-%fdupes %{buildroot}%{_datadir}
+%suse_update_desktop_file %{name} Network RemoteAccess GTK
-%if 0%{?suse_version} >= 1140
+%find_lang %{name} %{?no_lang_C}
+%find_lang %{name}-plugins %{?no_lang_C} %{name}.lang
+%if 0%{?suse_version} >= 1140
%post
%desktop_database_post
%icon_theme_cache_post
@@ -85,18 +184,89 @@
%postun
%desktop_database_postun
%icon_theme_cache_postun
+
+%post -n remmina-plugin-xdmcp
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-xdmcp
+%icon_theme_cache_postun
+
+%if %{with nx}
+%post -n remmina-plugin-nx
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-nx
+%icon_theme_cache_postun
+%endif
+
+%post -n remmina-plugin-rdp
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-rdp
+%icon_theme_cache_postun
+
+%post -n remmina-plugin-vnc
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-vnc
+%icon_theme_cache_postun
+
+%post -n remmina-plugin-telepathy
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-telepathy
+%icon_theme_cache_postun
%endif
-%files -f %{name}.lang
+%files
%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README README.SuSE
-%{_bindir}/*
-%{_datadir}/applications/*
-%{_datadir}/icons/*
-%{_datadir}/%{name}/
+%doc remmina/AUTHORS remmina/COPYING remmina/ChangeLog README README.SuSE
+%{_bindir}/remmina
+%{_datadir}/applications/remmina.desktop
+%{_datadir}/icons/hicolor/*/actions/*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/emblems/remmina-sftp.png
+%dir %{_libdir}/remmina
+%dir %{_libdir}/remmina/plugins/
+
+%files lang -f %{name}.lang
%files devel
%defattr(-,root,root)
%{_includedir}/%{name}/
+%{_libdir}/pkgconfig/%{name}.pc
+
+%files -n remmina-plugin-xdmcp
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-xdmcp.so
+%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp-ssh.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp.png
+
+%if %{with nx}
+%files -n remmina-plugin-nx
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-nx.so
+%{_datadir}/icons/hicolor/*/emblems/remmina-nx.png
+%endif
+
+%files -n remmina-plugin-rdp
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-rdp.so
+%{_datadir}/icons/hicolor/*/emblems/remmina-rdp-ssh.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-rdp.png
+
+%files -n remmina-plugin-vnc
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-vnc.so
+%{_datadir}/icons/hicolor/*/emblems/remmina-vnc-ssh.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-vnc.png
+
+%files -n remmina-plugin-telepathy
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-telepathy.so
+
+%files -n remmina-plugins-gnome
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugins-gnome.so
%changelog
++++++ remmina-fix-desktop-file.patch ++++++
Index: remmina-1.0.0/remmina/desktop/CMakeLists.txt
===================================================================
--- remmina-1.0.0.orig/remmina/desktop/CMakeLists.txt
+++ remmina-1.0.0/remmina/desktop/CMakeLists.txt
@@ -38,3 +38,4 @@ install(FILES ${ICON32_DATA} DESTINATION
install(FILES ${ICON48_DATA} DESTINATION ${ICON48_DIR})
install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR})
+install(FILES remmina.desktop DESTINATION "${REMMINA_DATADIR}/applications")
Index: remmina-1.0.0/CMakeLists.txt
===================================================================
--- remmina-1.0.0.orig/CMakeLists.txt
+++ remmina-1.0.0/CMakeLists.txt
@@ -78,7 +78,7 @@ include_directories(.)
include_directories(remmina/include)
set(REMMINA_VERSION "0.9.99.1")
-set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share/remmina")
+set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins")
Index: remmina-1.0.0/remmina/desktop/remmina.desktop
===================================================================
--- /dev/null
+++ remmina-1.0.0/remmina/desktop/remmina.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=Remmina Remote Desktop Client
+Comment=Connect to remote desktops
+TryExec=remmina
+Exec=remmina
+Icon=remmina
+Terminal=false
+Type=Application
+Actions=
+Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
+
++++++ remmina-fix-install-paths.patch ++++++
Index: remmina-1.0.0/CMakeLists.txt
===================================================================
--- remmina-1.0.0.orig/CMakeLists.txt
+++ remmina-1.0.0/CMakeLists.txt
@@ -80,7 +80,7 @@ include_directories(remmina/include)
set(REMMINA_VERSION "0.9.99.1")
set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
-set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins")
+set(REMMINA_PLUGINDIR
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/remmina/plugins")
find_suggested_package(PTHREAD)
if(PTHREAD_FOUND)
++++++ remmina-fix-linker-issue.patch ++++++
diff -urP remmina-1.0.0.orig/cmake/FindGLIB2.cmake
remmina-1.0.0/cmake/FindGLIB2.cmake
--- remmina-1.0.0.orig/cmake/FindGLIB2.cmake 1970-01-01 03:00:00.000000000
+0300
+++ remmina-1.0.0/cmake/FindGLIB2.cmake 2012-03-08 21:51:50.000000000 +0400
@@ -0,0 +1,120 @@
+# Remmina - The GTK+ Remote Desktop Client
+#
+# Copyright (C) 2012 Andrey Gankov
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330,
+# Boston, MA 02111-1307, USA.
+
+set(_GLIB_found_all true)
+
+# Glib
+
+pkg_check_modules(PC_GLIB2 glib-2.0)
+
+if(NOT PC_GLIB2_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GLIB2_INCLUDE_DIR_PART1 NAMES glib.h
+ HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
+ PATH_SUFFIXES glib-2.0)
+
+find_path(GLIB2_INCLUDE_DIR_PART2 NAMES glibconfig.h
+ HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
+ PATH_SUFFIXES glib-2.0/include)
+
+set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR_PART1} ${GLIB2_INCLUDE_DIR_PART2})
+
+find_library(GLIB2_LIBRARY NAMES glib-2.0)
+
+# GIO
+
+pkg_check_modules(PC_GIO gio-2.0)
+
+if(NOT PC_GIO_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GIO_INCLUDE_DIR gio/gio.h
+ HINTS ${PC_GIO_INCLUDEDIR} ${PC_GIO_INCLUDE_DIRS}
+ PATH_SUFFIXES gio-2.0)
+
+find_library(GIO_LIBRARY NAMES gio-2.0
+ HINTS ${PC_GIO_LIBDIR} ${PC_GIO_LIBRARY_DIRS})
+
+# gobject
+
+pkg_check_modules(PC_GOBJECT gobject-2.0)
+
+if(NOT PC_GOBJECT_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GOBJECT_INCLUDE_DIR gobject/gobject.h
+ HINTS ${PC_GOBJECT_INCLUDEDIR} ${PC_GOBJECT_INCLUDE_DIRS}
+ PATH_SUFFIXES gobject-2.0)
+
+find_library(GOBJECT_LIBRARY NAMES gobject-2.0
+ HINTS ${PC_GOBJECT_LIBDIR} ${PC_GOBJECT_LIBRARY_DIRS})
+
+# gmodule
+
+pkg_check_modules(PC_GMODULE gmodule-2.0)
+
+if(NOT PC_GMODULE_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GMODULE_INCLUDE_DIR gmodule.h
+ HINTS ${PC_GMODULE_INCLUDEDIR} ${PC_GMODULE_INCLUDE_DIRS}
+ PATH_SUFFIXES gmodule-2.0)
+
+find_library(GMODULE_LIBRARY NAMES gmodule-2.0
+ HINTS ${PC_GMODULE_LIBDIR} ${PC_GMODULE_LIBRARY_DIRS})
+
+# gthread
+
+pkg_check_modules(PC_GTHREAD gthread-2.0)
+
+if(NOT PC_GTHREAD_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GTHREAD_INCLUDE_DIR glib/gthread.h
+ HINTS ${PC_GTHREAD_INCLUDEDIR} ${PC_GTHREAD_INCLUDE_DIRS}
+ PATH_SUFFIXES gthread-2.0)
+
+find_library(GTHREAD_LIBRARY NAMES gthread-2.0
+ HINTS ${PC_GTHREAD_LIBDIR} ${PC_GTHREAD_LIBRARY_DIRS})
+
+# Finalize
+
+if(_GLIB_found_all)
+ include(FindPackageHandleStandardArgs)
+
+ find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARY
GLIB2_INCLUDE_DIR)
+
+ set(GLIB2_LIBRARIES ${GLIB2_LIBRARY} ${GIO_LIBRARY} ${GOBJECT_LIBRARY}
${GMODULE_LIBRARY} ${GTHREAD_LIBRARY})
+ set(GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${GIO_INCLUDE_DIR}
${GOBJECT_INCLUDE_DIR} ${GMODULE_INCLUDE_DIR} ${GTHREAD_INCLUDE_DIR})
+
+ mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARY)
+
+ set(GLIB_FOUND true)
+else()
+ unset(GLIB2_LIBRARY)
+ unset(GLIB2_INCLUDE_DIR)
+
+ set(GLIB_FOUND false)
+endif()
diff -urP remmina-1.0.0.orig/cmake/FindGTK2.cmake
remmina-1.0.0/cmake/FindGTK2.cmake
--- remmina-1.0.0.orig/cmake/FindGTK2.cmake 2012-02-10 22:54:23.000000000
+0400
+++ remmina-1.0.0/cmake/FindGTK2.cmake 2012-03-08 21:59:37.000000000 +0400
@@ -63,24 +63,11 @@
# Glib
-pkg_check_modules(PC_GLIB2 glib-2.0)
-
-if(NOT PC_GLIB2_FOUND)
+find_required_package(GLIB2)
+if(NOT GLIB2_FOUND)
set(_GTK2_found_all false)
endif()
-find_path(GLIB2_INCLUDE_DIR_PART1 NAMES glib.h
- HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
- PATH_SUFFIXES glib-2.0)
-
-find_path(GLIB2_INCLUDE_DIR_PART2 NAMES glibconfig.h
- HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
- PATH_SUFFIXES glib-2.0/include)
-
-set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR_PART1} ${GLIB2_INCLUDE_DIR_PART2})
-
-find_library(GLIB2_LIBRARY NAMES glib-2.0)
-
# Pango
pkg_check_modules(PC_PANGO pango)
@@ -129,8 +116,8 @@
find_package_handle_standard_args(GTK2 DEFAULT_MSG GTK2_LIBRARY
GTK2_INCLUDE_DIR)
- set(GTK2_LIBRARIES ${GTK2_LIBRARY} ${GDK2_LIBRARY} ${GLIB2_LIBRARY}
${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
- set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIR} ${GDK2_INCLUDE_DIR}
${GLIB2_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR}
${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
+ set(GTK2_LIBRARIES ${GTK2_LIBRARY} ${GDK2_LIBRARY} ${GLIB2_LIBRARIES}
${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
+ set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIR} ${GDK2_INCLUDE_DIR}
${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR}
${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
mark_as_advanced(GTK2_INCLUDE_DIR GTK2_LIBRARY)
diff -urP remmina-1.0.0.orig/cmake/FindGTK3.cmake
remmina-1.0.0/cmake/FindGTK3.cmake
--- remmina-1.0.0.orig/cmake/FindGTK3.cmake 2012-02-10 22:54:23.000000000
+0400
+++ remmina-1.0.0/cmake/FindGTK3.cmake 2012-03-08 21:08:04.000000000 +0400
@@ -48,29 +48,16 @@
HINTS ${PC_GDKPIXBUF_INCLUDEDIR} ${PC_GDKPIXBUF_INCLUDE_DIRS}
PATH_SUFFIXES gdk-pixbuf-2.0)
-find_library(GDKPIXBUF_LIBRARY NAMES gdk-3
+find_library(GDKPIXBUF_LIBRARY NAMES gdk_pixbuf-2.0
HINTS ${PC_GDKPIXBUF_LIBDIR} ${PC_GDKPIXBUF_LIBRARY_DIRS})
# Glib
-pkg_check_modules(PC_GLIB2 glib-2.0)
-
-if(NOT PC_GLIB2_FOUND)
+find_required_package(GLIB2)
+if(NOT GLIB2_FOUND)
set(_GTK3_found_all false)
endif()
-find_path(GLIB2_INCLUDE_DIR_PART1 NAMES glib.h
- HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
- PATH_SUFFIXES glib-2.0)
-
-find_path(GLIB2_INCLUDE_DIR_PART2 NAMES glibconfig.h
- HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
- PATH_SUFFIXES glib-2.0/include)
-
-set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR_PART1} ${GLIB2_INCLUDE_DIR_PART2})
-
-find_library(GLIB2_LIBRARY NAMES glib-2.0)
-
# Pango
pkg_check_modules(PC_PANGO pango)
@@ -119,8 +106,8 @@
find_package_handle_standard_args(GTK3 DEFAULT_MSG GTK3_LIBRARY
GTK3_INCLUDE_DIR)
- set(GTK3_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GLIB2_LIBRARY}
${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
- set(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}
${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR}
${ATK_INCLUDE_DIR})
+ set(GTK3_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GLIB2_LIBRARIES}
${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
+ set(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS}
${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR}
${ATK_INCLUDE_DIR})
mark_as_advanced(GTK3_INCLUDE_DIR GTK3_LIBRARY)
diff -urP remmina-1.0.0.orig/remmina/CMakeLists.txt
remmina-1.0.0/remmina/CMakeLists.txt
--- remmina-1.0.0.orig/remmina/CMakeLists.txt 2012-02-10 22:54:23.000000000
+0400
+++ remmina-1.0.0/remmina/CMakeLists.txt 2012-03-08 21:31:28.000000000
+0400
@@ -93,6 +93,10 @@
include_directories(${GTK_INCLUDE_DIRS})
target_link_libraries(remmina ${GTK_LIBRARIES})
+find_package(X11)
+include_directories(${X11_INCLUDE_DIR})
+target_link_libraries(remmina ${X11_LIBRARIES})
+
find_suggested_package(LIBSSH)
if(LIBSSH_FOUND)
add_definitions(-DHAVE_LIBSSH)
@@ -100,6 +104,11 @@
target_link_libraries(remmina ${LIBSSH_LIBRARIES})
endif()
+if(PTHREAD_FOUND)
+ include_directories(${PTHREAD_INCLUDE_DIRS})
+ target_link_libraries(remmina ${PTHREAD_LIBRARIES})
+endif()
+
if(GCRYPT_FOUND)
include_directories(${GCRYPT_INCLUDE_DIRS})
target_link_libraries(remmina ${GCRYPT_LIBRARIES})
++++++ remmina-gtk-2-22-support.patch ++++++
diff -ur remmina-1.0.0/cmake/FindGTK2.cmake
remmina-1.0.0.gtk-2.22/cmake/FindGTK2.cmake
--- remmina-1.0.0/cmake/FindGTK2.cmake 2012-03-08 21:59:37.000000000 +0400
+++ remmina-1.0.0.gtk-2.22/cmake/FindGTK2.cmake 2012-03-22 02:28:00.000000000
+0400
@@ -32,6 +32,8 @@
find_library(GTK2_LIBRARY NAMES gtk-x11-2.0)
+STRING(REGEX REPLACE "2[.]([0-9]+).*" "\\1" GTK2_VERSION "${PC_GTK2_VERSION}")
+
# Gdk
pkg_check_modules(PC_GDK2 gdk-x11-2.0)
Только в remmina-1.0.0/: CMakeLists.txt~
diff -ur remmina-1.0.0/remmina/src/remmina_ftp_client.c
remmina-1.0.0.gtk-2.22/remmina/src/remmina_ftp_client.c
--- remmina-1.0.0/remmina/src/remmina_ftp_client.c 2012-02-10
22:54:23.000000000 +0400
+++ remmina-1.0.0.gtk-2.22/remmina/src/remmina_ftp_client.c 2012-03-22
00:01:11.000000000 +0400
@@ -861,9 +861,17 @@
gtk_paned_pack1(GTK_PANED(vpaned), vbox, TRUE, FALSE);
/* Remote Directory */
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ widget = gtk_combo_box_entry_new_text ();
+#else
widget = gtk_combo_box_text_new_with_entry();
+#endif
gtk_widget_show(widget);
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "/");
+#else
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widget), "/");
+#endif
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
priv->directory_combo = widget;
@@ -1115,7 +1123,11 @@
g_free(t);
}
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+gtk_combo_box_prepend_text (GTK_COMBO_BOX (priv->directory_combo), dir);
+#else
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(priv->directory_combo), dir);
+#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(priv->directory_combo), 0);
g_free(priv->current_directory);
diff -ur remmina-1.0.0/remmina/src/remmina_public.c
remmina-1.0.0.gtk-2.22/remmina/src/remmina_public.c
--- remmina-1.0.0/remmina/src/remmina_public.c 2012-02-10 22:54:23.000000000
+0400
+++ remmina-1.0.0.gtk-2.22/remmina/src/remmina_public.c 2012-03-22
02:46:49.000000000 +0400
@@ -49,7 +49,11 @@
gchar *buf, *ptr1, *ptr2;
gint i;
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ combo = gtk_combo_box_entry_new_text ();
+#else
combo = gtk_combo_box_text_new_with_entry();
+#endif
found = FALSE;
if (text && text[0] != '\0')
@@ -65,7 +69,11 @@
if (descending)
{
+ #if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ gtk_combo_box_prepend_text (GTK_COMBO_BOX
(combo), ptr1);
+ #else
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(combo), ptr1);
+ #endif
if (!found && g_strcmp0(ptr1, def) == 0)
{
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
@@ -74,7 +82,11 @@
}
else
{
+ #if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo), ptr1);
+ #else
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), ptr1);
+ #endif
if (!found && g_strcmp0(ptr1, def) == 0)
{
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i);
@@ -262,10 +274,17 @@
GtkTreeIter iter;
gchar *s;
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ if (GTK_IS_COMBO_BOX(combo))
+ {
+ return gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo));
+ }
+#else
if (GTK_IS_COMBO_BOX_TEXT(combo))
{
return
gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo));
}
+#endif
if (!gtk_combo_box_get_active_iter(combo, &iter))
return NULL;
@@ -491,7 +510,11 @@
g_return_val_if_fail (gtk_widget_get_realized (GTK_WIDGET (gtkwindow)),
0);
window = gtk_widget_get_window (GTK_WIDGET (gtkwindow));
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ display = gdk_drawable_get_display (window);
+#else
display = gdk_window_get_display (window);
+#endif
gdk_error_trap_push ();
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
GDK_WINDOW_XID (window),
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package remmina for openSUSE:Factory checked
in at 2012-04-12 09:49:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/remmina (Old)
and /work/SRC/openSUSE:Factory/.remmina.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "remmina", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/remmina/remmina.changes 2011-10-13
12:41:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.remmina.new/remmina.changes 2012-04-12
09:49:06.000000000 +0200
@@ -1,0 +2,42 @@
+Mon Apr 2 19:05:16 UTC 2012 - gber@xxxxxxxxxxxx
+
+- use original tarball name to fix download check
+
+-------------------------------------------------------------------
+Mon Apr 2 13:17:49 UTC 2012 - gber@xxxxxxxxxxxx
+
+- disable the NX plugin by default
+
+-------------------------------------------------------------------
+Wed Mar 28 13:53:10 UTC 2012 - gber@xxxxxxxxxxxx
+
+- added separare patch remmina-fix-install-paths.patch in order to
+ fix the installation paths
+- specfile cleanup
+- removed remmina-plugins-common, now provided by the main package
+- split off -lang subpackage
+
+-------------------------------------------------------------------
+Wed Mar 21 23:00:28 UTC 2012 - gankov@xxxxxxxxxxxx
+
+- rewrote spec for using cmake
+- merged with remmina-plugins into one source package (upstream
+ now diestributes a single tarball with plugins)
+- update to version 1.0.0
+ + Main program design and functionality:
+ * Switch to the CMake build system
+ * Refactoring of code style
+ * Changing file name convention
+ + RDP protocol related:
+ * Support for FreeRDP 1.0
+ * Support for RemoteFX
+ * Support for Network Level Authentication
+ * Added certificate validation prompt
+- added remmina-fix-linker-issue.patch which fixes a linking issue
+ (backport from upstream git)
+- added remmina-fix-desktop-file.patch which fixes the installation
+ of the .desktop file (backport from upstream git)
+- added remmina-gtk-2-22-support.patch in order to build on
+ openSUSE 11.4 with GTK 2.22 as upstream requires 2.24+
+
+-------------------------------------------------------------------
Old:
----
remmina-0.9.3.tar.gz
New:
----
Remmina-1.0.0.tar.gz
remmina-fix-desktop-file.patch
remmina-fix-install-paths.patch
remmina-fix-linker-issue.patch
remmina-gtk-2-22-support.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ remmina.spec ++++++
--- /var/tmp/diff_new_pack.imJSrr/_old 2012-04-12 09:49:08.000000000 +0200
+++ /var/tmp/diff_new_pack.imJSrr/_new 2012-04-12 09:49:08.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package remmina
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,28 +12,59 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+%bcond_with nx
+
Name: remmina
-Version: 0.9.3
-Release: 1
-License: GPL-2.0+
+Version: 1.0.0
+Release: 0
Summary: Versatile Remote Desktop Client
-Url: http://remmina.sourceforge.net/
+License: GPL-2.0+
Group: Productivity/Networking/Other
-Source0:
http://downloads.sourceforge.net/project/remmina/0.9/%{name}-%{version}.tar.gz
+Url: http://remmina.sourceforge.net/
+Source0:
https://github.com/downloads/FreeRDP/Remmina/Remmina-%{version}.tar.gz
Source1: README.SuSE
-BuildRequires: fdupes
+# PATCH-FIX-UPSTREAM remmina-fix-linker-issue.patch gankov@xxxxxxxxxxxx --
Fixes linking issue (backport from upstream git)
+Patch0: remmina-fix-linker-issue.patch
+# PATCH-FIX-UPSTREAM remmina-fix-desktop-file.patch gber@xxxxxxxxxxxx -- Fixes
the installation of the .desktop file (backport from upstream git)
+Patch1: remmina-fix-desktop-file.patch
+# PATCH-FIX-UPSTREAM remmina-fix-install-paths.patch gber@xxxxxxxxxxxx --
Installs plugins under %%{_libdir} (backport from upstream git)
+Patch2: remmina-fix-install-paths.patch
+# PATCH-FIX-UPSTREAM remmina-gtk-2-22-support.patch gankov@xxxxxxxxxxxx --
Build on openSUSE 11.4 with GTK 2.22 as upstream requires 2.24+
+Patch3: remmina-gtk-2-22-support.patch
+BuildRequires: cmake
+BuildRequires: ed
BuildRequires: intltool
-BuildRequires: update-desktop-files
+BuildRequires: libgcrypt-devel
+BuildRequires: libjpeg-devel
BuildRequires: libssh-devel
+BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(avahi-glib)
+BuildRequires: pkgconfig(cairo)
+BuildRequires: pkgconfig(freerdp) >= 1.0
+BuildRequires: pkgconfig(gdk-pixbuf-2.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gnome-keyring-1)
+BuildRequires: pkgconfig(gnutls)
+BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(telepathy-glib)
BuildRequires: pkgconfig(unique-1.0)
+BuildRequires: pkgconfig(xkbfile)
+%if 0%{?suse_version} >= 1210
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(vte-2.90)
+%else
+BuildRequires: pkgconfig(gdk-x11-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(vte)
-BuildRequires: libgcrypt-devel
+%endif
+Provides: remmina-plugins-common = %{version}
+Obsoletes: remmina-plugins-common < 1.0.0
+Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -47,37 +78,105 @@
Summary: Development Files for %{name}
Group: Development/Libraries/Other
Requires: %{name} = %{version}
-Requires: libgcrypt-devel
-Requires: libssh-devel
-Requires: pkgconfig(avahi-glib)
-Requires: pkgconfig(gtk+-2.0)
-Requires: pkgconfig(unique-1.0)
-Requires: pkgconfig(vte)
%description devel
This package contains header files needed for developing plugins for
Remmina.
+%package -n remmina-plugin-xdmcp
+Summary: XDMCP Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+# for Xephyr
+Requires: xorg-x11-server-extra
+
+%description -n remmina-plugin-xdmcp
+This package provides the XDMCP protocol plugin for Remmina.
+
+%if %{with nx}
+%package -n remmina-plugin-nx
+Summary: NX Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+# for nxproxy
+Requires: NX
+
+%description -n remmina-plugin-nx
+This package provides the NX protocol plugin for Remmina.
+%endif
+
+%package -n remmina-plugin-rdp
+Summary: RDP Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: freerdp
+Requires: remmina >= %{version}
+
+%description -n remmina-plugin-rdp
+This package provides the RDP protocol plugin for Remmina.
+
+%package -n remmina-plugin-vnc
+Summary: VNC Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+
+%description -n remmina-plugin-vnc
+This package provides the RDP protocol plugin for Remmina.
+
+%package -n remmina-plugin-telepathy
+Summary: Telepathy Protocol Plugin for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+
+%description -n remmina-plugin-telepathy
+This package provides the Telepathy plugin for Remmina.
+
+%package -n remmina-plugins-gnome
+Summary: GNOME Plugins for Remmina
+Group: Productivity/Networking/Other
+Requires: remmina >= %{version}
+
+%description -n remmina-plugins-gnome
+This package provides the GNOME plugins for Remmina.
+
+%lang_package
+
%prep
-%setup -q
+%setup -q -n FreeRDP-Remmina-356c033
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
cp -r %{SOURCE1} README.SuSE
%build
-%configure
-make %{?_smp_mflags}
+mkdir build
+cd build
+export CFLAGS="%{optflags}"
+cmake \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DCMAKE_INSTALL_LIBDIR=%{_lib} \
+ -DWITH_APPINDICATOR=OFF \
+ ..
-%install
-%make_install
+make %{?_smp_mflags} VERBOSE=1
-%if 0%{?suse_version}
-%suse_update_desktop_file -i %{name} Network RemoteAccess
+%install
+(
+ cd build
+ %make_install
+)
+
+%if %{without nx}
+rm -f %{buildroot}%{_libdir}/remmina/plugins/remmina-plugin-nx.so \
+ %{buildroot}%{_datadir}/icons/hicolor/*/emblems/remmina-nx.png
%endif
-%find_lang %{name}
-%fdupes %{buildroot}%{_datadir}
+%suse_update_desktop_file %{name} Network RemoteAccess GTK
-%if 0%{?suse_version} >= 1140
+%find_lang %{name} %{?no_lang_C}
+%find_lang %{name}-plugins %{?no_lang_C} %{name}.lang
+%if 0%{?suse_version} >= 1140
%post
%desktop_database_post
%icon_theme_cache_post
@@ -85,18 +184,89 @@
%postun
%desktop_database_postun
%icon_theme_cache_postun
+
+%post -n remmina-plugin-xdmcp
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-xdmcp
+%icon_theme_cache_postun
+
+%if %{with nx}
+%post -n remmina-plugin-nx
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-nx
+%icon_theme_cache_postun
+%endif
+
+%post -n remmina-plugin-rdp
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-rdp
+%icon_theme_cache_postun
+
+%post -n remmina-plugin-vnc
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-vnc
+%icon_theme_cache_postun
+
+%post -n remmina-plugin-telepathy
+%icon_theme_cache_post
+
+%postun -n remmina-plugin-telepathy
+%icon_theme_cache_postun
%endif
-%files -f %{name}.lang
+%files
%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README README.SuSE
-%{_bindir}/*
-%{_datadir}/applications/*
-%{_datadir}/icons/*
-%{_datadir}/%{name}/
+%doc remmina/AUTHORS remmina/COPYING remmina/ChangeLog README README.SuSE
+%{_bindir}/remmina
+%{_datadir}/applications/remmina.desktop
+%{_datadir}/icons/hicolor/*/actions/*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/emblems/remmina-sftp.png
+%dir %{_libdir}/remmina
+%dir %{_libdir}/remmina/plugins/
+
+%files lang -f %{name}.lang
%files devel
%defattr(-,root,root)
%{_includedir}/%{name}/
+%{_libdir}/pkgconfig/%{name}.pc
+
+%files -n remmina-plugin-xdmcp
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-xdmcp.so
+%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp-ssh.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp.png
+
+%if %{with nx}
+%files -n remmina-plugin-nx
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-nx.so
+%{_datadir}/icons/hicolor/*/emblems/remmina-nx.png
+%endif
+
+%files -n remmina-plugin-rdp
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-rdp.so
+%{_datadir}/icons/hicolor/*/emblems/remmina-rdp-ssh.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-rdp.png
+
+%files -n remmina-plugin-vnc
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-vnc.so
+%{_datadir}/icons/hicolor/*/emblems/remmina-vnc-ssh.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-vnc.png
+
+%files -n remmina-plugin-telepathy
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugin-telepathy.so
+
+%files -n remmina-plugins-gnome
+%defattr(-,root,root)
+%{_libdir}/remmina/plugins/remmina-plugins-gnome.so
%changelog
++++++ remmina-fix-desktop-file.patch ++++++
Index: remmina-1.0.0/remmina/desktop/CMakeLists.txt
===================================================================
--- remmina-1.0.0.orig/remmina/desktop/CMakeLists.txt
+++ remmina-1.0.0/remmina/desktop/CMakeLists.txt
@@ -38,3 +38,4 @@ install(FILES ${ICON32_DATA} DESTINATION
install(FILES ${ICON48_DATA} DESTINATION ${ICON48_DIR})
install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR})
+install(FILES remmina.desktop DESTINATION "${REMMINA_DATADIR}/applications")
Index: remmina-1.0.0/CMakeLists.txt
===================================================================
--- remmina-1.0.0.orig/CMakeLists.txt
+++ remmina-1.0.0/CMakeLists.txt
@@ -78,7 +78,7 @@ include_directories(.)
include_directories(remmina/include)
set(REMMINA_VERSION "0.9.99.1")
-set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share/remmina")
+set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins")
Index: remmina-1.0.0/remmina/desktop/remmina.desktop
===================================================================
--- /dev/null
+++ remmina-1.0.0/remmina/desktop/remmina.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=Remmina Remote Desktop Client
+Comment=Connect to remote desktops
+TryExec=remmina
+Exec=remmina
+Icon=remmina
+Terminal=false
+Type=Application
+Actions=
+Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
+
++++++ remmina-fix-install-paths.patch ++++++
Index: remmina-1.0.0/CMakeLists.txt
===================================================================
--- remmina-1.0.0.orig/CMakeLists.txt
+++ remmina-1.0.0/CMakeLists.txt
@@ -80,7 +80,7 @@ include_directories(remmina/include)
set(REMMINA_VERSION "0.9.99.1")
set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
-set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins")
+set(REMMINA_PLUGINDIR
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/remmina/plugins")
find_suggested_package(PTHREAD)
if(PTHREAD_FOUND)
++++++ remmina-fix-linker-issue.patch ++++++
diff -urP remmina-1.0.0.orig/cmake/FindGLIB2.cmake
remmina-1.0.0/cmake/FindGLIB2.cmake
--- remmina-1.0.0.orig/cmake/FindGLIB2.cmake 1970-01-01 03:00:00.000000000
+0300
+++ remmina-1.0.0/cmake/FindGLIB2.cmake 2012-03-08 21:51:50.000000000 +0400
@@ -0,0 +1,120 @@
+# Remmina - The GTK+ Remote Desktop Client
+#
+# Copyright (C) 2012 Andrey Gankov
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330,
+# Boston, MA 02111-1307, USA.
+
+set(_GLIB_found_all true)
+
+# Glib
+
+pkg_check_modules(PC_GLIB2 glib-2.0)
+
+if(NOT PC_GLIB2_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GLIB2_INCLUDE_DIR_PART1 NAMES glib.h
+ HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
+ PATH_SUFFIXES glib-2.0)
+
+find_path(GLIB2_INCLUDE_DIR_PART2 NAMES glibconfig.h
+ HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
+ PATH_SUFFIXES glib-2.0/include)
+
+set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR_PART1} ${GLIB2_INCLUDE_DIR_PART2})
+
+find_library(GLIB2_LIBRARY NAMES glib-2.0)
+
+# GIO
+
+pkg_check_modules(PC_GIO gio-2.0)
+
+if(NOT PC_GIO_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GIO_INCLUDE_DIR gio/gio.h
+ HINTS ${PC_GIO_INCLUDEDIR} ${PC_GIO_INCLUDE_DIRS}
+ PATH_SUFFIXES gio-2.0)
+
+find_library(GIO_LIBRARY NAMES gio-2.0
+ HINTS ${PC_GIO_LIBDIR} ${PC_GIO_LIBRARY_DIRS})
+
+# gobject
+
+pkg_check_modules(PC_GOBJECT gobject-2.0)
+
+if(NOT PC_GOBJECT_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GOBJECT_INCLUDE_DIR gobject/gobject.h
+ HINTS ${PC_GOBJECT_INCLUDEDIR} ${PC_GOBJECT_INCLUDE_DIRS}
+ PATH_SUFFIXES gobject-2.0)
+
+find_library(GOBJECT_LIBRARY NAMES gobject-2.0
+ HINTS ${PC_GOBJECT_LIBDIR} ${PC_GOBJECT_LIBRARY_DIRS})
+
+# gmodule
+
+pkg_check_modules(PC_GMODULE gmodule-2.0)
+
+if(NOT PC_GMODULE_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GMODULE_INCLUDE_DIR gmodule.h
+ HINTS ${PC_GMODULE_INCLUDEDIR} ${PC_GMODULE_INCLUDE_DIRS}
+ PATH_SUFFIXES gmodule-2.0)
+
+find_library(GMODULE_LIBRARY NAMES gmodule-2.0
+ HINTS ${PC_GMODULE_LIBDIR} ${PC_GMODULE_LIBRARY_DIRS})
+
+# gthread
+
+pkg_check_modules(PC_GTHREAD gthread-2.0)
+
+if(NOT PC_GTHREAD_FOUND)
+ set(_GLIB_found_all false)
+endif()
+
+find_path(GTHREAD_INCLUDE_DIR glib/gthread.h
+ HINTS ${PC_GTHREAD_INCLUDEDIR} ${PC_GTHREAD_INCLUDE_DIRS}
+ PATH_SUFFIXES gthread-2.0)
+
+find_library(GTHREAD_LIBRARY NAMES gthread-2.0
+ HINTS ${PC_GTHREAD_LIBDIR} ${PC_GTHREAD_LIBRARY_DIRS})
+
+# Finalize
+
+if(_GLIB_found_all)
+ include(FindPackageHandleStandardArgs)
+
+ find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARY
GLIB2_INCLUDE_DIR)
+
+ set(GLIB2_LIBRARIES ${GLIB2_LIBRARY} ${GIO_LIBRARY} ${GOBJECT_LIBRARY}
${GMODULE_LIBRARY} ${GTHREAD_LIBRARY})
+ set(GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${GIO_INCLUDE_DIR}
${GOBJECT_INCLUDE_DIR} ${GMODULE_INCLUDE_DIR} ${GTHREAD_INCLUDE_DIR})
+
+ mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARY)
+
+ set(GLIB_FOUND true)
+else()
+ unset(GLIB2_LIBRARY)
+ unset(GLIB2_INCLUDE_DIR)
+
+ set(GLIB_FOUND false)
+endif()
diff -urP remmina-1.0.0.orig/cmake/FindGTK2.cmake
remmina-1.0.0/cmake/FindGTK2.cmake
--- remmina-1.0.0.orig/cmake/FindGTK2.cmake 2012-02-10 22:54:23.000000000
+0400
+++ remmina-1.0.0/cmake/FindGTK2.cmake 2012-03-08 21:59:37.000000000 +0400
@@ -63,24 +63,11 @@
# Glib
-pkg_check_modules(PC_GLIB2 glib-2.0)
-
-if(NOT PC_GLIB2_FOUND)
+find_required_package(GLIB2)
+if(NOT GLIB2_FOUND)
set(_GTK2_found_all false)
endif()
-find_path(GLIB2_INCLUDE_DIR_PART1 NAMES glib.h
- HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
- PATH_SUFFIXES glib-2.0)
-
-find_path(GLIB2_INCLUDE_DIR_PART2 NAMES glibconfig.h
- HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
- PATH_SUFFIXES glib-2.0/include)
-
-set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR_PART1} ${GLIB2_INCLUDE_DIR_PART2})
-
-find_library(GLIB2_LIBRARY NAMES glib-2.0)
-
# Pango
pkg_check_modules(PC_PANGO pango)
@@ -129,8 +116,8 @@
find_package_handle_standard_args(GTK2 DEFAULT_MSG GTK2_LIBRARY
GTK2_INCLUDE_DIR)
- set(GTK2_LIBRARIES ${GTK2_LIBRARY} ${GDK2_LIBRARY} ${GLIB2_LIBRARY}
${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
- set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIR} ${GDK2_INCLUDE_DIR}
${GLIB2_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR}
${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
+ set(GTK2_LIBRARIES ${GTK2_LIBRARY} ${GDK2_LIBRARY} ${GLIB2_LIBRARIES}
${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
+ set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIR} ${GDK2_INCLUDE_DIR}
${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR}
${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
mark_as_advanced(GTK2_INCLUDE_DIR GTK2_LIBRARY)
diff -urP remmina-1.0.0.orig/cmake/FindGTK3.cmake
remmina-1.0.0/cmake/FindGTK3.cmake
--- remmina-1.0.0.orig/cmake/FindGTK3.cmake 2012-02-10 22:54:23.000000000
+0400
+++ remmina-1.0.0/cmake/FindGTK3.cmake 2012-03-08 21:08:04.000000000 +0400
@@ -48,29 +48,16 @@
HINTS ${PC_GDKPIXBUF_INCLUDEDIR} ${PC_GDKPIXBUF_INCLUDE_DIRS}
PATH_SUFFIXES gdk-pixbuf-2.0)
-find_library(GDKPIXBUF_LIBRARY NAMES gdk-3
+find_library(GDKPIXBUF_LIBRARY NAMES gdk_pixbuf-2.0
HINTS ${PC_GDKPIXBUF_LIBDIR} ${PC_GDKPIXBUF_LIBRARY_DIRS})
# Glib
-pkg_check_modules(PC_GLIB2 glib-2.0)
-
-if(NOT PC_GLIB2_FOUND)
+find_required_package(GLIB2)
+if(NOT GLIB2_FOUND)
set(_GTK3_found_all false)
endif()
-find_path(GLIB2_INCLUDE_DIR_PART1 NAMES glib.h
- HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
- PATH_SUFFIXES glib-2.0)
-
-find_path(GLIB2_INCLUDE_DIR_PART2 NAMES glibconfig.h
- HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
- PATH_SUFFIXES glib-2.0/include)
-
-set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR_PART1} ${GLIB2_INCLUDE_DIR_PART2})
-
-find_library(GLIB2_LIBRARY NAMES glib-2.0)
-
# Pango
pkg_check_modules(PC_PANGO pango)
@@ -119,8 +106,8 @@
find_package_handle_standard_args(GTK3 DEFAULT_MSG GTK3_LIBRARY
GTK3_INCLUDE_DIR)
- set(GTK3_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GLIB2_LIBRARY}
${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
- set(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}
${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR}
${ATK_INCLUDE_DIR})
+ set(GTK3_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GLIB2_LIBRARIES}
${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
+ set(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS}
${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR}
${ATK_INCLUDE_DIR})
mark_as_advanced(GTK3_INCLUDE_DIR GTK3_LIBRARY)
diff -urP remmina-1.0.0.orig/remmina/CMakeLists.txt
remmina-1.0.0/remmina/CMakeLists.txt
--- remmina-1.0.0.orig/remmina/CMakeLists.txt 2012-02-10 22:54:23.000000000
+0400
+++ remmina-1.0.0/remmina/CMakeLists.txt 2012-03-08 21:31:28.000000000
+0400
@@ -93,6 +93,10 @@
include_directories(${GTK_INCLUDE_DIRS})
target_link_libraries(remmina ${GTK_LIBRARIES})
+find_package(X11)
+include_directories(${X11_INCLUDE_DIR})
+target_link_libraries(remmina ${X11_LIBRARIES})
+
find_suggested_package(LIBSSH)
if(LIBSSH_FOUND)
add_definitions(-DHAVE_LIBSSH)
@@ -100,6 +104,11 @@
target_link_libraries(remmina ${LIBSSH_LIBRARIES})
endif()
+if(PTHREAD_FOUND)
+ include_directories(${PTHREAD_INCLUDE_DIRS})
+ target_link_libraries(remmina ${PTHREAD_LIBRARIES})
+endif()
+
if(GCRYPT_FOUND)
include_directories(${GCRYPT_INCLUDE_DIRS})
target_link_libraries(remmina ${GCRYPT_LIBRARIES})
++++++ remmina-gtk-2-22-support.patch ++++++
diff -ur remmina-1.0.0/cmake/FindGTK2.cmake
remmina-1.0.0.gtk-2.22/cmake/FindGTK2.cmake
--- remmina-1.0.0/cmake/FindGTK2.cmake 2012-03-08 21:59:37.000000000 +0400
+++ remmina-1.0.0.gtk-2.22/cmake/FindGTK2.cmake 2012-03-22 02:28:00.000000000
+0400
@@ -32,6 +32,8 @@
find_library(GTK2_LIBRARY NAMES gtk-x11-2.0)
+STRING(REGEX REPLACE "2[.]([0-9]+).*" "\\1" GTK2_VERSION "${PC_GTK2_VERSION}")
+
# Gdk
pkg_check_modules(PC_GDK2 gdk-x11-2.0)
Только в remmina-1.0.0/: CMakeLists.txt~
diff -ur remmina-1.0.0/remmina/src/remmina_ftp_client.c
remmina-1.0.0.gtk-2.22/remmina/src/remmina_ftp_client.c
--- remmina-1.0.0/remmina/src/remmina_ftp_client.c 2012-02-10
22:54:23.000000000 +0400
+++ remmina-1.0.0.gtk-2.22/remmina/src/remmina_ftp_client.c 2012-03-22
00:01:11.000000000 +0400
@@ -861,9 +861,17 @@
gtk_paned_pack1(GTK_PANED(vpaned), vbox, TRUE, FALSE);
/* Remote Directory */
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ widget = gtk_combo_box_entry_new_text ();
+#else
widget = gtk_combo_box_text_new_with_entry();
+#endif
gtk_widget_show(widget);
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "/");
+#else
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widget), "/");
+#endif
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
priv->directory_combo = widget;
@@ -1115,7 +1123,11 @@
g_free(t);
}
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+gtk_combo_box_prepend_text (GTK_COMBO_BOX (priv->directory_combo), dir);
+#else
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(priv->directory_combo), dir);
+#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(priv->directory_combo), 0);
g_free(priv->current_directory);
diff -ur remmina-1.0.0/remmina/src/remmina_public.c
remmina-1.0.0.gtk-2.22/remmina/src/remmina_public.c
--- remmina-1.0.0/remmina/src/remmina_public.c 2012-02-10 22:54:23.000000000
+0400
+++ remmina-1.0.0.gtk-2.22/remmina/src/remmina_public.c 2012-03-22
02:46:49.000000000 +0400
@@ -49,7 +49,11 @@
gchar *buf, *ptr1, *ptr2;
gint i;
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ combo = gtk_combo_box_entry_new_text ();
+#else
combo = gtk_combo_box_text_new_with_entry();
+#endif
found = FALSE;
if (text && text[0] != '\0')
@@ -65,7 +69,11 @@
if (descending)
{
+ #if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ gtk_combo_box_prepend_text (GTK_COMBO_BOX
(combo), ptr1);
+ #else
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(combo), ptr1);
+ #endif
if (!found && g_strcmp0(ptr1, def) == 0)
{
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
@@ -74,7 +82,11 @@
}
else
{
+ #if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo), ptr1);
+ #else
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), ptr1);
+ #endif
if (!found && g_strcmp0(ptr1, def) == 0)
{
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i);
@@ -262,10 +274,17 @@
GtkTreeIter iter;
gchar *s;
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ if (GTK_IS_COMBO_BOX(combo))
+ {
+ return gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo));
+ }
+#else
if (GTK_IS_COMBO_BOX_TEXT(combo))
{
return
gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo));
}
+#endif
if (!gtk_combo_box_get_active_iter(combo, &iter))
return NULL;
@@ -491,7 +510,11 @@
g_return_val_if_fail (gtk_widget_get_realized (GTK_WIDGET (gtkwindow)),
0);
window = gtk_widget_get_window (GTK_WIDGET (gtkwindow));
+#if GTK_VERSION == 2 && GTK2_VERSION <= 22
+ display = gdk_drawable_get_display (window);
+#else
display = gdk_window_get_display (window);
+#endif
gdk_error_trap_push ();
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
GDK_WINDOW_XID (window),
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |