From a8d81bb7c06d69a18efd2a56f06c0ac9c3443d33 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Tue, 27 May 2014 08:44:39 +0200
Subject: [PATCH] Sort BuildRequires and CMake flags

---
 remmina.spec | 50 +++++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/remmina.spec b/remmina.spec
index 0d61358..b28c051 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -14,20 +14,22 @@ URL:            http://remmina.sourceforge.net
 #VCS: git:https://github.com/FreeRDP/Remmina.git
 Source0:        https://github.com/FreeRDP/Remmina/archive/%{commit}/Remmina-%{commit}.tar.gz
 
-BuildRequires:  gtk3-devel
-BuildRequires:  libssh-devel >= 0.4
-BuildRequires:  libgcrypt-devel
 BuildRequires:  avahi-ui-devel
-BuildRequires:  vte3-devel
 BuildRequires:  cmake >= 2.8
-BuildRequires:  gettext
-BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
-BuildRequires:  libxkbfile-devel
-
+BuildRequires:  freerdp-devel >= 1.2.0
+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:  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}
@@ -67,7 +69,6 @@ The %{name}-devel package contains header files for developing plugins for
 
 %package        plugins-gnome
 Summary:        GNOME keyring integration for Remmina Remote Desktop Client
-BuildRequires:  libgnome-keyring-devel
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    plugins-gnome
@@ -96,7 +97,6 @@ This package contains the NX plugin for the Remmina remote desktop client.
 
 %package        plugins-rdp
 Summary:        RDP plugin for Remmina Remote Desktop Client
-BuildRequires:  freerdp-devel >= 1.2.0
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       freerdp
 
@@ -111,7 +111,6 @@ remote desktop client.
 
 %package        plugins-telepathy
 Summary:        Telepathy plugin for Remmina Remote Desktop Client
-BuildRequires:  telepathy-glib-devel
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    plugins-telepathy
@@ -161,35 +160,32 @@ sed -i -e '/add_subdirectory(external_tools)/d' %{name}/CMakeLists.txt
 
 %build
 mkdir -p build
-pushd build
 
 CFLAGS="%{optflags} -DLIBVNCSERVER_WITH_CLIENT_TLS=1"
 LDFLAGS="-Wl,-z,relro -Wl,--no-as-needed"
 
-%cmake \
-    -DWITH_PTHREAD=ON \
+%cmake --build=build \
+    -DCMAKE_INSTALL_LIBDIR=%{_lib} \
+    -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+    -DLIBVNCSERVER_WITH_CLIENT_TLS=1 \
+    -DWITH_APPINDICATOR=OFF \
+    -DWITH_AVAHI=ON \
+    -DWITH_FREERDP=ON \
     -DWITH_GCRYPT=ON \
-    -DWITH_LIBSSH=ON \
-    -DWITH_VTE=ON \
+    -DWITH_GETTEXT=ON \
     -DWITH_GETTEXT=ON \
     -DWITH_LIBSSH=ON \
-    -DWITH_FREERDP=ON \
+    -DWITH_LIBSSH=ON \
+    -DWITH_PTHREAD=ON \
     -DWITH_TELEPATHY=ON \
+    -DWITH_VTE=ON \
     -DWITH_ZLIB=ON \
-    -DWITH_GETTEXT=ON \
-    -DWITH_AVAHI=ON \
-    -DWITH_APPINDICATOR=OFF \
-    -LIBVNCSERVER_INCLUDE_DIRS=%{_includedir} \
-    -DLIBVNCSERVER_WITH_CLIENT_TLS=1 \
-    -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-    -DCMAKE_INSTALL_LIBDIR=%{_lib} \
-    ..
+    .
 
 make %{?_smp_mflags}
-popd
 
 %install
-make install/fast DESTDIR=%{buildroot} -C build
+make install/fast DESTDIR=%{buildroot}
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop