From 09f6ab6270c670b919d1b739b69c63ef63bc00fd Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Oct 11 2017 13:42:24 +0000
Subject: Fix EPEL 7 compilation

Fix some compiler warnings

---

diff --git a/arc-gui-clients-warnings.patch b/arc-gui-clients-warnings.patch
new file mode 100644
index 0000000..5ebd667
--- /dev/null
+++ b/arc-gui-clients-warnings.patch
@@ -0,0 +1,32 @@
+diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/arcstoragewindow.cpp arc-gui-clients-0.4.6-Source/src/arcstorage-ui/arcstoragewindow.cpp
+--- arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/arcstoragewindow.cpp	2013-10-17 00:03:09.000000000 +0200
++++ arc-gui-clients-0.4.6-Source/src/arcstorage-ui/arcstoragewindow.cpp	2017-10-11 14:47:44.831995230 +0200
+@@ -1629,14 +1629,14 @@
+ {
+     QByteArray data = m_tarProcess->readAllStandardError();
+     QString text = QString(data);
+-    std::cout << text.toStdString() << endl;
++    std::cout << text.toStdString() << std::endl;
+ }
+ 
+ void ArcStorageWindow::onTarStandardOutput()
+ {
+     QByteArray data = m_tarProcess->readAllStandardOutput();
+     QString text = QString(data);
+-    std::cout << text.toStdString() << endl;
++    std::cout << text.toStdString() << std::endl;
+ }
+ 
+ void ArcStorageWindow::onTarFinished(int exitCode, QProcess::ExitStatus exitStatus)
+diff -ur arc-gui-clients-0.4.6-Source.orig/src/common/arcproxy-utils.cpp arc-gui-clients-0.4.6-Source/src/common/arcproxy-utils.cpp
+--- arc-gui-clients-0.4.6-Source.orig/src/common/arcproxy-utils.cpp	2013-10-17 00:03:09.000000000 +0200
++++ arc-gui-clients-0.4.6-Source/src/common/arcproxy-utils.cpp	2017-10-11 14:49:06.399103083 +0200
+@@ -1255,7 +1255,7 @@
+             Arc::UserConfig usercfg_tmp( (Arc::initializeCredentialsType(Arc::initializeCredentialsType::SkipCredentials)) );
+             usercfg_tmp.CACertificatesDirectory(usercfg.CACertificatesDirectory());
+ 
+-            Arc::CredentialStore cstore( (usercfg_tmp,Arc::URL("myproxy://"+myproxy_server)) );
++            Arc::CredentialStore cstore(usercfg_tmp,Arc::URL("myproxy://"+myproxy_server));
+             std::map<std::string,std::string> myproxyopt;
+             myproxyopt["username"] = user_name;
+             myproxyopt["password"] = passphrase;
diff --git a/arc-gui-clients.spec b/arc-gui-clients.spec
index a7c9642..36afb58 100644
--- a/arc-gui-clients.spec
+++ b/arc-gui-clients.spec
@@ -1,6 +1,6 @@
 Name:		arc-gui-clients
 Version:	0.4.6
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	ARC Graphical Clients
 
 License:	ASL 2.0
@@ -10,6 +10,8 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.
 Patch0:		%{name}-arc4.patch
 #		Fixes for ARC version 5.1
 Patch1:		%{name}-arc5.patch
+#		Fix some compiler warnings
+Patch2:		%{name}-warnings.patch
 
 BuildRequires:	cmake
 BuildRequires:	qt4-devel
@@ -26,12 +28,15 @@ Provides graphical clients to the NorduGrid ARC middleware.
 %setup -q -n %{name}-%{version}-Source
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-%if %{?fedora}%{!?fedora:0} == 23
-# Workaround for too new libsigc++/glibmm + too old gcc combo in Fedora 23
-export CXXFLAGS="%{optflags} -std=c++11"
-%endif
+if pkg-config --atleast-version 2.6 sigc++-2.0 ; then
+  if [ `echo __GNUC__ | gcc -E - | tail -1` -lt 6 ] ; then
+    # Workaround for too new libsigc++/glibmm, too old gcc combination
+    export CXXFLAGS="%{optflags} -std=c++11"
+  fi
+fi
 
 %cmake
 make %{?_smp_mflags}
@@ -46,8 +51,8 @@ make install DESTDIR=%{buildroot}
 #
 # See http://www.freedesktop.org/software/appstream/docs/ for more details.
 #
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/arcstat-ui.appdata.xml <<EOF
+mkdir -p %{buildroot}%{_datadir}/appdata
+cat > %{buildroot}%{_datadir}/appdata/arcstat-ui.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
@@ -82,6 +87,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/arcsub-ui.desktop
 %{?_licensedir: %license LICENSE}
 
 %changelog
+* Wed Oct 11 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 0.4.6-13
+- Fix EPEL 7 compilation
+- Fix some compiler warnings
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild