[conserver] removed dependency on ligssglue/libgssapi as krb5-devel provides gssapi itself
jkastner
jkastner at fedoraproject.org
Mon Sep 16 13:25:34 UTC 2013
commit 753991149a52c7685139f04245573a005c7459a2
Author: Jiri Kastner <cz172638 at gmail.com>
Date: Mon Sep 16 15:21:35 2013 +0200
removed dependency on ligssglue/libgssapi as krb5-devel provides gssapi itself
conserver-gssapi.patch | 21 +++++++++++++++++++++
conserver.spec | 12 +++++++++---
2 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/conserver-gssapi.patch b/conserver-gssapi.patch
new file mode 100644
index 0000000..0eb5e9e
--- /dev/null
+++ b/conserver-gssapi.patch
@@ -0,0 +1,21 @@
+--- conserver-8.1.18/configure.in 2009-09-26 11:18:35.000000000 +0200
++++ conserver-8.1.18/configure.in.new 2013-09-16 15:10:12.321980501 +0200
+@@ -554,7 +554,17 @@
+ cons_with_gssapi="YES"
+ AC_DEFINE(HAVE_GSSAPI)
+ have_gssapi=yes],
+- [AC_MSG_RESULT(no)])])])],)
++ [AC_MSG_RESULT(no)
++ LIBS="$oLIBS -lgssapi_krb5"
++ AC_MSG_CHECKING(for gssapi library -lgssapi_krb5)
++ AC_TRY_LINK([#include <gssapi/gssapi.h>
++ ],[gss_create_empty_oid_set(NULL, NULL)],
++ [AC_MSG_RESULT(yes)
++ cons_with_gssapi="YES"
++ AC_DEFINE(HAVE_GSSAPI)
++ have_gssapi=yes],
++ [AC_MSG_RESULT(no)])])])])],)
++
+
+ if test $have_gssapi = no; then
+ LIBS="$oLIBS"
diff --git a/conserver.spec b/conserver.spec
index f20ba68..8ce324e 100644
--- a/conserver.spec
+++ b/conserver.spec
@@ -1,6 +1,6 @@
Name: conserver
Version: 8.1.18
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Serial console server daemon/client
Group: System Environment/Daemons
@@ -10,10 +10,11 @@ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz
Source1: %{name}.service
Patch0: %{name}-no-exampledir.patch
#Patch1: %{name}-initscript.patch
+Patch2: %{name}-gssapi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pam-devel, openssl-devel, tcp_wrappers-devel, krb5-devel
-BuildRequires: libgssapi-devel, libgssglue-devel
+BuildRequires: autoconf, automake, systemd-units
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -35,7 +36,7 @@ This is the client package needed to interact with a Conserver daemon.
%setup -q
%patch0 -p1
#%patch1 -p1
-
+%patch2 -p1
%build
# we don't want to install the solaris conserver.rc file
@@ -43,6 +44,8 @@ f="conserver/Makefile.in"
%{__mv} $f $f.orig
%{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f
+autoreconf -f -i
+
%configure --with-libwrap \
--with-openssl \
--with-pam \
@@ -124,6 +127,9 @@ fi
%{_mandir}/man1/console.1.gz
%changelog
+* Mon Sep 16 2013 Jiri Kastner <jkastner (at) redhat (dot) com> - 8.1.18-9
+- removed libgss*-devel build dependency
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.1.18-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list