Hello community, here is the log from the commit of package remmina for openSUSE:Factory checked in at 2016-07-21 08:17:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/remmina (Old) and /work/SRC/openSUSE:Factory/.remmina.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "remmina" Changes: -------- --- /work/SRC/openSUSE:Factory/remmina/remmina.changes 2015-11-02 12:55:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.remmina.new/remmina.changes 2016-07-21 08:17:53.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Jun 13 12:23:17 UTC 2016 - [email protected] + +- update to version 1.2.0.rcgit.13 as freerdp 1.0 isn't available anymore +- dropped patches: + * remmina-close-ssh-tunnel-on-disconnect.patch + * remmina-fix-desktop-file.patch + * remmina-fix-fullscreen-with-multiple-monitors.patch + * remmina-fix-install-paths.patch + * remmina-fix-linker-issue.patch + * remmina-fix-scrolling-in-vnc-plugin.patch + * remmina-fix-window-resize.patch + * remmina-gtk-2-22-support.patch + * remmina-remove-inline-libvncserver.patch + * remmina-vte-2.91-support.patch + +------------------------------------------------------------------- Old: ---- Remmina-1.0.0.tar.gz remmina-close-ssh-tunnel-on-disconnect.patch remmina-fix-desktop-file.patch remmina-fix-fullscreen-with-multiple-monitors.patch remmina-fix-install-paths.patch remmina-fix-linker-issue.patch remmina-fix-scrolling-in-vnc-plugin.patch remmina-fix-window-resize.patch remmina-gtk-2-22-support.patch remmina-remove-inline-libvncserver.patch remmina-vte-2.91-support.patch New: ---- 1.2.0.rcgit.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ remmina.spec ++++++ --- /var/tmp/diff_new_pack.qzDfld/_old 2016-07-21 08:17:55.000000000 +0200 +++ /var/tmp/diff_new_pack.qzDfld/_new 2016-07-21 08:17:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package remmina # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,68 +16,52 @@ # -%bcond_with nx - +%define rversion 1.2.0.rcgit.13 Name: remmina -Version: 1.0.0 +Version: 1.2.0~rcgit.13 Release: 0 Summary: Versatile Remote Desktop Client License: GPL-2.0+ Group: Productivity/Networking/Other Url: http://remmina.sourceforge.net/ -Source0: https://github.com/downloads/FreeRDP/Remmina/Remmina-%{version}.tar.gz +Source0: https://github.com/FreeRDP/Remmina/archive/%{rversion}.tar.gz Source1: README.SUSE -# PATCH-FIX-UPSTREAM remmina-fix-linker-issue.patch [email protected] -- Fixes linking issue (backport from upstream git) -Patch0: remmina-fix-linker-issue.patch -# PATCH-FIX-UPSTREAM remmina-fix-desktop-file.patch [email protected] -- 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 [email protected] -- Installs plugins under %%{_libdir} (backport from upstream git) -Patch2: remmina-fix-install-paths.patch -# PATCH-FIX-UPSTREAM remmina-gtk-2-22-support.patch [email protected] -- Build on openSUSE 11.4 with GTK 2.22 as upstream requires 2.24+ -Patch3: remmina-gtk-2-22-support.patch -# PATCH-FIX-UPSTREAM remmina-remove-inline-libvncserver.patch [email protected] -- Remove inline copy of libvncserver (backport from upstream git) -Patch4: remmina-remove-inline-libvncserver.patch -# PATCH-FIX-UPSTREAM remmina-fix-scrolling-in-vnc-plugin.patch [email protected] -- Fix scrolling in the VNC plugin (backport from upstream git) -Patch5: remmina-fix-scrolling-in-vnc-plugin.patch -# PATCH-FIX-UPSTREAM remmina-close-ssh-tunnel-on-disconnect.patch [email protected] -- Close SSH tunnel on disconnect and avoid freezing (backport from upstream git) -Patch6: remmina-close-ssh-tunnel-on-disconnect.patch -# PATCH-FIX-UPSTREAM remmina-fix-window-resize.patch [email protected] -- Fix resizing the window (backport from upstream git) -Patch7: remmina-fix-window-resize.patch -# PATCH-FIX-UPSTREAM remmina-fix-fullscreen-with-multiple-monitors.patch [email protected] -- Fix fullscreen mode with multiple monitors (backport from upstream git) -Patch8: remmina-fix-fullscreen-with-multiple-monitors.patch -# PATCH-FIX-UPSTREAM remmina-vte-2.91-support.patch [email protected] -- Support building against vte 2.91 -Patch9: remmina-vte-2.91-support.patch BuildRequires: cmake BuildRequires: ed BuildRequires: intltool BuildRequires: libgcrypt-devel BuildRequires: libjpeg-devel -BuildRequires: libssh-devel +BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: pkgconfig(appindicator3-0.1) BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(avahi-glib) BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(freerdp) >= 1.0 +BuildRequires: pkgconfig(freerdp2) >= 2.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libssh) BuildRequires: pkgconfig(libvncserver) BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(spice-client-gtk-3.0) BuildRequires: pkgconfig(telepathy-glib) BuildRequires: pkgconfig(unique-1.0) +BuildRequires: pkgconfig(webkit2gtk-4.0) +BuildRequires: pkgconfig(winpr2) BuildRequires: pkgconfig(xkbfile) +Recommends: %{name}-lang = %{version} +Provides: remmina-plugins-common = %{version} +Obsoletes: remmina-plugins-common < 1.0.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-build # vte-2.90 has been dropped from newer releases %if 0%{?suse_version} < 1315 BuildRequires: pkgconfig(vte-2.90) %else BuildRequires: pkgconfig(vte-2.91) %endif -BuildRequires: pkgconfig(gtk+-3.0) -Provides: remmina-plugins-common = %{version} -Obsoletes: remmina-plugins-common < 1.0.0 -Recommends: %{name}-lang = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Remmina is a remote desktop client written in GTK+, aiming to be useful for @@ -95,12 +79,18 @@ This package contains header files needed for developing plugins for Remmina. +%package -n remmina-plugin-spice +Summary: SPICE Protocol Plugin for Remmina +Group: Productivity/Networking/Other +Requires: remmina = %{version} + +%description -n remmina-plugin-spice +This package provides the SPICE protocol plugin 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 +Requires: remmina = %{version} %description -n remmina-plugin-xdmcp This package provides the XDMCP protocol plugin for Remmina. @@ -109,9 +99,9 @@ %package -n remmina-plugin-nx Summary: NX Protocol Plugin for Remmina Group: Productivity/Networking/Other -Requires: remmina >= %{version} # for nxproxy Requires: NX +Requires: remmina = %{version} %description -n remmina-plugin-nx This package provides the NX protocol plugin for Remmina. @@ -121,7 +111,7 @@ Summary: RDP Protocol Plugin for Remmina Group: Productivity/Networking/Other Requires: freerdp -Requires: remmina >= %{version} +Requires: remmina = %{version} %description -n remmina-plugin-rdp This package provides the RDP protocol plugin for Remmina. @@ -129,23 +119,23 @@ %package -n remmina-plugin-vnc Summary: VNC Protocol Plugin for Remmina Group: Productivity/Networking/Other -Requires: remmina >= %{version} +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} +#%%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. +#%%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} +Requires: remmina = %{version} %description -n remmina-plugins-gnome This package provides the GNOME plugins for Remmina. @@ -153,38 +143,18 @@ %lang_package %prep -%setup -q -n FreeRDP-Remmina-356c033 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%if 0%{?suse_version} >= 1315 -%patch9 -p1 -%endif +%setup -q -n Remmina-%{rversion} cp -r %{SOURCE1} README.SUSE %build -mkdir build -cd build -export CFLAGS="%{optflags} -DLIBVNCSERVER_WITH_CLIENT_TLS=1" -cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_INSTALL_LIBDIR=%{_lib} \ - -DWITH_APPINDICATOR=OFF \ - .. +#TODO: When gh#FreeRDP/Remmina#714 is fixed enable TELEPATHY +%cmake \ + -DWITH_TELEPATHY=OFF -make %{?_smp_mflags} VERBOSE=1 +make %{?_smp_mflags} %install -( - cd build - %make_install -) +%cmake_install %if %{without nx} rm -f %{buildroot}%{_libdir}/remmina/plugins/remmina-plugin-nx.so \ @@ -193,8 +163,7 @@ %suse_update_desktop_file %{name} Network RemoteAccess GTK -%find_lang %{name} %{?no_lang_C} -%find_lang %{name}-plugins %{?no_lang_C} %{name}.lang +%find_lang %{name} %if 0%{?suse_version} >= 1140 %post @@ -205,6 +174,12 @@ %desktop_database_postun %icon_theme_cache_postun +%post -n remmina-plugin-spice +%icon_theme_cache_post + +%postun -n remmina-plugin-spice +%icon_theme_cache_postun + %post -n remmina-plugin-xdmcp %icon_theme_cache_post @@ -231,31 +206,40 @@ %postun -n remmina-plugin-vnc %icon_theme_cache_postun -%post -n remmina-plugin-telepathy -%icon_theme_cache_post +#%%post -n remmina-plugin-telepathy +#%%icon_theme_cache_post -%postun -n remmina-plugin-telepathy -%icon_theme_cache_postun +#%%postun -n remmina-plugin-telepathy +#%%icon_theme_cache_postun %endif %files %defattr(-,root,root) -%doc remmina/AUTHORS remmina/COPYING remmina/ChangeLog README README.SUSE -%{_bindir}/remmina -%{_datadir}/applications/remmina.desktop +%doc AUTHORS CHANGELOG.md LICENSE LICENSE.OpenSSL README.md README.SUSE +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/actions/* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/emblems/remmina-sftp.png -%dir %{_libdir}/remmina -%dir %{_libdir}/remmina/plugins/ +%dir %{_datadir}/appdata +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/%{name} +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/plugins/ %files lang -f %{name}.lang +%defattr(-,root,root) %files devel %defattr(-,root,root) %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc +%files -n remmina-plugin-spice +%defattr(-,root,root) +%{_libdir}/remmina/plugins/remmina-plugin-spice.so +%{_datadir}/icons/hicolor/*/emblems/remmina-spice.png + %files -n remmina-plugin-xdmcp %defattr(-,root,root) %{_libdir}/remmina/plugins/remmina-plugin-xdmcp.so @@ -281,9 +265,9 @@ %{_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-plugin-telepathy +#%%defattr(-,root,root) +#%%{_libdir}/remmina/plugins/remmina-plugin-telepathy.so %files -n remmina-plugins-gnome %defattr(-,root,root)
