[guacamole-server/el6] Add autoconf patch for RHEL autconf compatibility
Simone Caronni
slaanesh at fedoraproject.org
Thu Sep 5 14:15:53 UTC 2013
commit 3210503d806625d88a9585b144620d0a41ff2409
Author: Simone Caronni <negativo17 at gmail.com>
Date: Thu Sep 5 16:15:12 2013 +0200
Add autoconf patch for RHEL autconf compatibility
guacamole-server-0.8.3-autoconf.patch | 35 +++++++++++++++++++++++++++++++++
guacamole-server.spec | 20 ++++++------------
2 files changed, 42 insertions(+), 13 deletions(-)
---
diff --git a/guacamole-server-0.8.3-autoconf.patch b/guacamole-server-0.8.3-autoconf.patch
new file mode 100644
index 0000000..18f3ffb
--- /dev/null
+++ b/guacamole-server-0.8.3-autoconf.patch
@@ -0,0 +1,35 @@
+diff -Naur guacamole-server-0.8.3.old/configure.ac guacamole-server-0.8.3/configure.ac
+--- guacamole-server-0.8.3.old/configure.ac 2013-09-05 15:15:18.894754798 +0200
++++ guacamole-server-0.8.3/configure.ac 2013-09-05 16:12:22.171447409 +0200
+@@ -301,27 +301,27 @@
+
+ # Keyboard layout header
+ AC_CHECK_HEADERS([freerdp/locale/keyboard.h],,
+- AC_CHECK_HEADERS([freerdp/kbd/layouts.h],,
++ [AC_CHECK_HEADERS([freerdp/kbd/layouts.h],,
+ [AC_MSG_WARN([
+ --------------------------------------------
+ Unable to find keyboard layout headers
+ RDP will be disabled.
+ --------------------------------------------])
+- have_freerdp=no]))
++ have_freerdp=no])])
+
+ # New headers defining addins
+ AC_CHECK_HEADERS([freerdp/addin.h freerdp/client/channels.h])
+
+ # Header defining cliprdr
+ AC_CHECK_HEADERS([freerdp/client/cliprdr.h],,
+- AC_CHECK_HEADERS([freerdp/plugins/cliprdr.h],,
++ [AC_CHECK_HEADERS([freerdp/plugins/cliprdr.h],,
+ [AC_MSG_WARN([
+ --------------------------------------------
+ Unable to find cliprdr headers
+ RDP will be disabled.
+ --------------------------------------------])
+ have_freerdp=no],
+- [#include <freerdp/types.h>]),
++ [#include <freerdp/types.h>])],
+ [#include <winpr/wtypes.h>
+ #include <winpr/collections.h>])
+
diff --git a/guacamole-server.spec b/guacamole-server.spec
index 9048526..f27e6d6 100644
--- a/guacamole-server.spec
+++ b/guacamole-server.spec
@@ -3,7 +3,7 @@
Name: guacamole-server
Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Server-side native components that form the Guacamole proxy
License: MPLv1.1 or GPLv2+
@@ -12,14 +12,12 @@ Source0: http://guac-dev.org/pub/dist/source/%{name}-%{version}.tar.gz
Source1: %{name}.sysconfig
Source2: %{name}.service
Source3: %{name}.init
+Patch0: %{name}-0.8.3-autoconf.patch
-%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: libtool
-%endif
-
BuildRequires: doxygen
+BuildRequires: libtool
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(freerdp)
BuildRequires: pkgconfig(gnutls)
@@ -115,18 +113,11 @@ framework to translate between arbitrary protocols and the Guacamole protocol.
%prep
%setup -q
+%patch0 -p1
%build
-%if 0%{?fedora} || 0%{?rhel} >= 7
autoreconf -vif
%configure
-%endif
-
-%if 0%{?rhel} == 6
-%configure
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%endif
make %{?_smp_mflags}
cd doc/
@@ -249,6 +240,9 @@ fi
%attr(750,%{username},%{username}) %{_sharedstatedir}/guacd
%changelog
+* Thu Sep 05 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.3-3
+- Add autoconf patch for RHEL autconf compatibility.
+
* Mon Sep 02 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.3-2
- Add specific EPEL 6 workaround for really old autoconf version.
More information about the scm-commits
mailing list