rpms/shellinabox
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix epel 5 build

Browse source
This commit is contained in:
Simone Caronni 2015-08-31 13:16:18 +02:00
commit 052d5dbbe2
3 changed files with 88 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

38
0001-Added-autoconf-automake-stuff-for-compatibility-with.patch Normal file
View file

@ -0,0 +1,38 @@
From 284265651b2876a6d6d95ccbcd757befc86f6e0d Mon Sep 17 00:00:00 2001
From: Benji Wiebe <benjiwiebe14@gmail.com>
Date: Fri, 28 Aug 2015 23:15:13 -0500
Subject: [PATCH 1/2] Added autoconf/automake stuff for compatibility with
older auto* versions
---
Makefile.am | 1 +
configure.ac | 1 +
2 files changed, 2 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 2a59fe2..7a88ccb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,6 +127,7 @@ BUILT_SOURCES = shellinabox/beep.h \
shellinaboxd_LDADD = liblogging.la \
libhttp.la
shellinaboxd_LDFLAGS = -static
+docdir = ${datadir}/doc/${PACKAGE}
symbolname = \
sed -e 's/.*\/\([^.]*\)[.].*/\1/' \
diff --git a/configure.ac b/configure.ac
index 9a7b1ab..f4e815f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ CFLAGS="${CFLAGS:--Os}"
AM_INIT_AUTOMAKE([subdir-objects])
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
+AM_PROG_CC_C_O
AC_LANG_WERROR
AC_PROG_INSTALL
AC_PROG_LIBTOOL
--
2.4.3

37
0002-Added-explanatory-comments.patch Normal file
View file

@ -0,0 +1,37 @@
From 36f512cc6335c59ce967a3f05805e6ca0f3a350e Mon Sep 17 00:00:00 2001
From: Benji Wiebe <benjiwiebe14@gmail.com>
Date: Fri, 28 Aug 2015 23:42:09 -0500
Subject: [PATCH 2/2] Added explanatory comments
---
Makefile.am | 1 +
configure.ac | 1 +
2 files changed, 2 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 7a88ccb..7b8e7ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,6 +127,7 @@ BUILT_SOURCES = shellinabox/beep.h \
shellinaboxd_LDADD = liblogging.la \
libhttp.la
shellinaboxd_LDFLAGS = -static
+## Added this for compatibility with older versions of autoconf/automake
docdir = ${datadir}/doc/${PACKAGE}
symbolname = \
diff --git a/configure.ac b/configure.ac
index f4e815f..2a2bdb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ CFLAGS="${CFLAGS:--Os}"
AM_INIT_AUTOMAKE([subdir-objects])
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
+dnl Added this for compatibility with older versions of autoconf/automake
AM_PROG_CC_C_O
AC_LANG_WERROR
AC_PROG_INSTALL
--
2.4.3

15
shellinabox.spec
View file

@ -6,17 +6,22 @@
Name: shellinabox
Version: 2.17
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Web based AJAX terminal emulator
Group: System Environment/Daemons
License: GPLv2
URL: https://github.com/%{name}/%{name}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: shellinaboxd.sysconfig
Source2: shellinaboxd.service
Source3: shellinaboxd.init
Patch0: %{name}-ssh-options.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# From upstream - https://github.com/shellinabox/shellinabox/pull/340
Patch1: 0001-Added-autoconf-automake-stuff-for-compatibility-with.patch
Patch2: 0002-Added-explanatory-comments.patch
BuildRequires: autoconf
BuildRequires: automake
@ -50,6 +55,8 @@ browser plugins.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
autoreconf -vif
@ -141,6 +148,10 @@ fi
%attr(750,%{username},%{username}) %{_sharedstatedir}/%{name}
%changelog
* Mon Aug 31 2015 Simone Caronni <negativo17@gmail.com> - 2.17-3
- Backport patch from upstream:
https://github.com/shellinabox/shellinabox/pull/340
* Wed Aug 26 2015 Simone Caronni <negativo17@gmail.com> - 2.17-2
- Add license macro.
- Install files manually, as this simplifies installation of docs in versioned