From 056798da5625080c34976ff93ff8ec7334e3fb3a Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 7 Jun 2016 16:36:22 +0200 Subject: [PATCH] Fix versioning --- remmina.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/remmina.spec b/remmina.spec index ba5fd5a..0af0af0 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,16 +1,18 @@ # 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.13 + +# RC releases +%global snapshot rcgit.13 Name: remmina Version: 1.2.0 -Release: 0.16.rcgit.12%{?shortcommit0:.git.%{shortcommit0}}%{?dist} +Release: 0.17%{?snapshot:.%{snapshot}}%{?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/%{upstream_version}.tar.gz#/Remmina-%{upstream_version}.tar.gz +Source0: https://github.com/FreeRDP/Remmina/archive/%{version}%{?snapshot:.%{snapshot}}.tar.gz#/Remmina-%{version}%{?snapshot:.%{snapshot}}.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 @@ -158,7 +160,7 @@ client. %prep -%setup -qn Remmina-%{upstream_version} +%setup -qn Remmina-%{version}%{?snapshot:.%{snapshot}} #? 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 @@ -321,6 +323,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Jun 07 2016 Simone Caronni - 1.2.0-0.17.rcgit.13 +- Use "snapshot" name only once in the SPEC file. + * 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.