From 341c7753e7918ad07a91eac2d57b291f5ca63235 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Fri, 13 Mar 2015 15:52:59 +0100 Subject: [PATCH] Update to latest 1.2.0 snapshot (post 1.2.0-rcgit.2) for updated FreeRDP. Require latest FreeRDP snapshot for building. Remove upstream patch. Format and sort BuildRequires, add AppData file. --- .gitignore | 1 + remmina.spec | 76 +++++++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 44 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 6e961b2..f277689 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ remmina-0.7.5.tar.gz /Remmina-65d2ca4872150942cced1fbe92248dd933e9c0cb.tar.gz /Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.tar.gz /v1.2.0-rcgit.1.tar.gz +/Remmina-b3e339ea5478c0941a6dfa0bf8fed9e7a1c70e0b.tar.gz diff --git a/remmina.spec b/remmina.spec index dba40cb..3f14769 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,42 +1,44 @@ # Review at https://bugzilla.redhat.com/show_bug.cgi?id=553402 -Name: remmina -Version: 1.2.0 -Release: 0.1.rcgit.1%{?dist} -Summary: Remote Desktop Client +# https://fedoraproject.org/wiki/Packaging:SourceURL#Github +%global commit b3e339ea5478c0941a6dfa0bf8fed9e7a1c70e0b +%global shortcommit %(c=%{commit}; echo ${c:0:7}) -License: GPLv2+ and MIT -URL: http://remmina.sourceforge.net +Name: remmina +Version: 1.2.0 +Release: 0.3%{?shortcommit:.git.%{shortcommit}}%{?dist} +Summary: Remote Desktop Client + +License: GPLv2+ and MIT +URL: http://remmina.sourceforge.net # VCS: git:https://github.com/FreeRDP/Remmina.git -Source0: https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.1.tar.gz +Source0: https://github.com/FreeRDP/Remmina/archive/%{commit}/Remmina-%{commit}.tar.gz # Cmake helper file to easy build plugins outside remmina sourse tree # See http://www.muflone.com/remmina-plugin-rdesktop/english/install.html which # use http://www.muflone.com/remmina-plugin-builder/ with remmina bundled source. # So we can't use it directly only as instructions. -Source1: pluginBuild-CMakeLists.txt - -BuildRequires: avahi-ui-devel -BuildRequires: cmake >= 2.8 -BuildRequires: desktop-file-utils -BuildRequires: freerdp-devel >= 1:1.2.0-0.4.beta.1 -BuildRequires: gettext -BuildRequires: gnutls-devel -BuildRequires: gtk3-devel -BuildRequires: intltool -BuildRequires: libgcrypt-devel -BuildRequires: libgnome-keyring-devel -BuildRequires: libjpeg-devel -BuildRequires: libssh-devel >= 0.4 -BuildRequires: libvncserver-devel -BuildRequires: libwinpr-devel >= 1:1.2.0-0.4.beta.1 -BuildRequires: libxkbfile-devel -BuildRequires: telepathy-glib-devel -BuildRequires: vte3-devel -BuildRequires: libappindicator-gtk3-devel - -# https://github.com/FreeRDP/Remmina/commit/17827fbd95156ad249b429bb0d862b5affa615e8 -Patch0: %{name}-tools.patch +Source1: pluginBuild-CMakeLists.txt + +BuildRequires: avahi-ui-devel +BuildRequires: cmake >= 2.8 +BuildRequires: desktop-file-utils +BuildRequires: freerdp-devel >= 1:1.2.1-0.1 +BuildRequires: gettext +BuildRequires: gnutls-devel +BuildRequires: gtk3-devel +BuildRequires: intltool +BuildRequires: libappindicator-gtk3-devel +BuildRequires: libappstream-glib +BuildRequires: libgcrypt-devel +BuildRequires: libgnome-keyring-devel +BuildRequires: libjpeg-devel +BuildRequires: libssh-devel >= 0.4 +BuildRequires: libvncserver-devel +BuildRequires: libwinpr-devel >= 1:1.2.1-0.1 +BuildRequires: libxkbfile-devel +BuildRequires: telepathy-glib-devel +BuildRequires: vte3-devel # We don't ship the remmina-plugins-common package any longer Provides: remmina-plugins-common = %{version} @@ -144,8 +146,7 @@ client. %prep -%setup -qn Remmina-1.2.0-rcgit.1 -%patch0 -p1 +%setup -qn Remmina-%{commit} #? Hack: https://github.com/FreeRDP/Remmina/issues/292 sed -i 's#install(DIRECTORY include/remmina DESTINATION include/remmina #install(DIRECTORY remmina/include/remmina DESTINATION include/ #' CMakeLists.txt @@ -178,6 +179,7 @@ make %{?_smp_mflags} %make_install desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml mkdir -p %{buildroot}/%{_libdir}/cmake/%{name}/ cp -pr cmake/*.cmake %{buildroot}/%{_libdir}/cmake/%{name}/ @@ -185,7 +187,6 @@ cp -pr config.h.in %{buildroot}/%{_includedir}/%{name}/ cp -p %{SOURCE1} %{buildroot}/%{_includedir}/%{name}/ %find_lang %{name} -%find_lang %{name}-plugins %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -250,9 +251,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%files -f %{name}.lang -f %{name}-plugins.lang +%files -f %{name}.lang %doc AUTHORS ChangeLog LICENSE README %{_bindir}/%{name} +%{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/actions/*.* %{_datadir}/icons/hicolor/*/apps/*.* @@ -293,6 +295,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Feb 24 2015 Simone Caronni - 1.2.0-0.2.rcgit.2 +- Update to latest 1.2.0 snapshot (post 1.2.0-rcgit.2) for updated FreeRDP. +- Require latest FreeRDP snapshot for building. +- Remove upstream patch. +- Format and sort BuildRequires, add AppData file. + * Tue Dec 16 2014 Simone Caronni - 1.2.0-0.1.rcgit.1 - Update to latest 1.2.0 snapshot. - Require latest FreeRDP 1.2.0-beta1+android9 for building. diff --git a/sources b/sources index 71f6982..f88fb62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd92d1beb5c0c3acb6e32ad546e30d84 v1.2.0-rcgit.1.tar.gz +5416021bacea67866835a14dd2f22af5 Remmina-b3e339ea5478c0941a6dfa0bf8fed9e7a1c70e0b.tar.gz