diff --git a/.gitignore b/.gitignore index e0e5a14..d5b813e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ remmina-0.7.5.tar.gz /Remmina-b43697d.tar.gz /Remmina-1.2.0-rcgit.7.tar.gz /Remmina-1.2.0.rcgit.12.tar.gz +/Remmina-1.2.0.rcgit.13.tar.gz diff --git a/remmina.spec b/remmina.spec index e71c160..ba5fd5a 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,16 +1,16 @@ # Main branch is the "next" branch, not master #%%global commit0 b43697d8d79cea20d3fdbdea2c4b8de92a2f331f #%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7}) -%global upstream_version 1.2.0.rcgit.12 +%global upstream_version 1.2.0.rcgit.13 Name: remmina Version: 1.2.0 -Release: 0.15.rcgit.12%{?shortcommit0:.git.%{shortcommit0}}%{?dist} +Release: 0.16.rcgit.12%{?shortcommit0:.git.%{shortcommit0}}%{?dist} Summary: Remote Desktop Client License: GPLv2+ and MIT URL: http://remmina.sourceforge.net #Source0: https://github.com/FreeRDP/Remmina/archive/%%{commit0}/Remmina-%%{commit0}.tar.gz#/Remmina-%%{shortcommit0}.tar.gz -Source0: https://github.com/FreeRDP/Remmina/archive/1.2.0.rcgit.12.tar.gz#/Remmina-%{upstream_version}.tar.gz +Source0: https://github.com/FreeRDP/Remmina/archive/%{upstream_version}.tar.gz#/Remmina-%{upstream_version}.tar.gz # Cmake helper file to easy build plugins outside remmina source tree # See http://www.muflone.com/remmina-plugin-rdesktop/english/install.html which @@ -32,6 +32,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libssh) >= 0.6 BuildRequires: pkgconfig(libvncserver) +BuildRequires: pkgconfig(spice-client-gtk-3.0) BuildRequires: pkgconfig(telepathy-glib) BuildRequires: pkgconfig(vte-2.91) BuildRequires: pkgconfig(xkbfile) @@ -143,6 +144,19 @@ This package contains the XDMCP plugin for the Remmina remote desktop client. +%package plugins-spice +Summary: SPICE plugin for Remmina Remote Desktop Client +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description plugins-spice +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 net-books. + +This package contains the SPICE plugin for the Remmina remote desktop +client. + + %prep %setup -qn Remmina-%{upstream_version} @@ -161,10 +175,8 @@ mkdir -p build -DWITH_FREERDP=ON \ -DWITH_GCRYPT=ON \ -DWITH_GETTEXT=ON \ - -DWITH_GETTEXT=ON \ -DWITH_LIBSSH=ON \ - -DWITH_LIBSSH=ON \ - -DWITH_PTHREAD=ON \ + -DWITH_SPICE=ON \ -DWITH_SURVEY=OFF \ -DWITH_TELEPATHY=ON \ -DWITH_VTE=ON \ @@ -201,6 +213,8 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %post plugins-xdmcp touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +%post plugins-spice +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun if [ $1 -eq 0 ] ; then @@ -232,6 +246,11 @@ if [ $1 -eq 0 ] ; then gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%postun plugins-spice +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -248,6 +267,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %posttrans plugins-xdmcp gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%posttrans plugins-spice +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files -f %{name}.lang %{!?_licensedir:%global license %%doc} @@ -293,8 +315,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp-ssh.png %{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp.png +%files plugins-spice +%{_libdir}/remmina/plugins/remmina-plugin-spice.so +%{_datadir}/icons/hicolor/*/emblems/remmina-spice.png + %changelog +* Tue Jun 07 2016 Simone Caronni - 1.2.0-0.16.rcgit.12 +- Update to version 12.0-rcgit.13, enable SPICE plugin, update cmake options. + * Fri May 20 2016 David Woodhouse - 1.2.0-0.15.rcgit.12 - Disable survey, as it has build problems diff --git a/sources b/sources index c1875d7..8e683fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5bfa6a90077b41749a162c7a87e66461 Remmina-1.2.0.rcgit.12.tar.gz +158828e85350b1db55a0b1f21deb9048 Remmina-1.2.0.rcgit.13.tar.gz