diff --git a/.gitignore b/.gitignore index 4f85810..f8c7ac9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ remmina-0.7.5.tar.gz /remmina-20120330gitffba771d.tar.bz2 /Remmina-1.0.0.tar.gz /Remmina-26b814aec6e930746d079c885449dd50d3484fb0.tar.gz +/Remmina-1470c974cddaede87d09345f712202ddcda0810b.tar.gz diff --git a/remmina.spec b/remmina.spec index d059c65..8bc98c3 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,12 +1,12 @@ # Review at https://bugzilla.redhat.com/show_bug.cgi?id=553402 # https://fedoraproject.org/wiki/Packaging:SourceURL#Github -%global commit 26b814aec6e930746d079c885449dd50d3484fb0 +%global commit 1470c974cddaede87d09345f712202ddcda0810b %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: remmina -Version: 1.1.0 -Release: 0.3%{?shortcommit:.git.%{shortcommit}}%{?dist} +Version: 1.0.0 +Release: 11%{?shortcommit:.git.%{shortcommit}}%{?dist} Summary: Remote Desktop Client License: GPLv2+ and MIT @@ -35,16 +35,6 @@ BuildRequires: vte3-devel Provides: remmina-plugins-common = %{version} Obsoletes: remmina-plugins-common < 1.0.0-7 -# 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 @@ -84,8 +74,6 @@ remote desktop client. Summary: NX plugin for Remmina Remote Desktop Client Requires: %{name}%{?_isa} = %{version}-%{release} Requires: nx -Obsoletes: qtnx < 0.9-17 -Provides: qtnx = 0.9-17 %description plugins-nx Remmina is a remote desktop client written in GTK+, aiming to be useful for @@ -98,7 +86,6 @@ This package contains the NX plugin for the Remmina remote desktop client. %package plugins-rdp Summary: RDP plugin for Remmina Remote Desktop Client Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: freerdp %description plugins-rdp Remmina is a remote desktop client written in GTK+, aiming to be useful for @@ -152,18 +139,18 @@ client. %prep %setup -qn Remmina-%{commit} -# Remove useless tags from desktop file -sed -i -e '/^OnlyShowIn/d' %{name}/desktop/%{name}.desktop - -# Remove external_tools (test scripts) -sed -i -e '/add_subdirectory(external_tools)/d' %{name}/CMakeLists.txt +# Do not install tools into user home directory +sed -i \ + -e 's@$ENV{HOME}/.%{name}@%{_libexecdir}/%{name}@g' \ + -e '/^file(MAKE_DIRECTORY/d' \ + %{name}/external_tools/CMakeLists.txt +sed -i \ + -e 's@%s/.%{name}@%{_libexecdir}/%{name}@g' \ + %{name}/src/%{name}_external_tools.c %build mkdir -p build -CFLAGS="%{optflags} -DLIBVNCSERVER_WITH_CLIENT_TLS=1" -LDFLAGS="-Wl,-z,relro -Wl,--no-as-needed" - %cmake --build=build \ -DCMAKE_INSTALL_LIBDIR=%{_lib} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -262,6 +249,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/actions/*.* %{_datadir}/icons/hicolor/*/apps/*.* %{_datadir}/icons/hicolor/*/emblems/remmina-sftp.png +%{_libexecdir}/%{name}/ %dir %{_libdir}/remmina/ %dir %{_libdir}/remmina/plugins/ @@ -296,6 +284,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jul 18 2014 Simone Caronni - 1.0.0-11.git.1470c97 +- Update to latest snapshot. +- Release number bumped to 1.2.0 beta 1 and then reverted to 1.0.0 upstram, + adjust accordingly. +- Desktop file fixed upstream, remove sed line. +- Package grdc, qtnx, gnome-applet-remmina and xfce4-remmina-plugin are not + required anymore by any package. +- Remove requirement on freerdp binary for plugins-rdp. + * Sun Jun 08 2014 Fedora Release Engineering - 1.1.0-0.3.git.26b814a - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index b4c9e67..30bf2fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7875e50f21f7d0f2e86527375da6755 Remmina-26b814aec6e930746d079c885449dd50d3484fb0.tar.gz +ae43ffbf87654559e7d904da4d328e8f Remmina-1470c974cddaede87d09345f712202ddcda0810b.tar.gz