- implemented heimdal patch in more flexible way, allowing to choose heimdal even...

- renamed krb5 bcond to gssglue (this is that the bcond does)

Changed files:
    libtirpc-heimdal.patch -> 1.3
    libtirpc.spec -> 1.26

diff --git a/libtirpc-heimdal.patch b/libtirpc-heimdal.patch
index 36181ecd963ce462f29bd7db0ccde7bbe7dc6789..2b5504678cb522ec6c1f64bbf02977594a826a2f 100644 (file)
--- a/libtirpc-heimdal.patch
+++ b/libtirpc-heimdal.patch
@@ -1,21 +1,34 @@
-diff -ur libtirpc-0.1.10/configure.ac libtirpc-0.1.10-heimdal/configure.ac
---- libtirpc-0.1.10/configure.ac       2008-11-19 14:01:43.000000000 +0100
-+++ libtirpc-0.1.10-heimdal/configure.ac       2009-06-30 14:52:36.541185534 +0200
-@@ -11,8 +11,12 @@
+--- libtirpc-0.2.1/configure.ac.orig   2009-11-30 15:04:55.000000000 +0100
++++ libtirpc-0.2.1/configure.ac        2010-08-14 08:49:50.618819943 +0200
+@@ -3,16 +3,23 @@
+ AM_MAINTAINER_MODE
+ AC_CONFIG_SRCDIR([src/auth_des.c])
+ 
++GSSAPI_IMPLEMENTATION=libgssglue
+ AC_ARG_ENABLE(gss,[  --enable-gss            Turn on gss api], [case "${enableval}" in
+-        yes) gss=true ; AC_CHECK_LIB([gssapi],[gss_init_sec_context]) ;;
++        yes) gss=true ;;
+         no)  gss=false ;;
+-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-gss) ;;
++        *) gss=true; GSSAPI_IMPLEMENTATION="$enableval" ;;
+       esac],[gss=false])
  AM_CONDITIONAL(GSS, test x$gss = xtrue)
  if test x$gss = xtrue; then
-       AC_DEFINE(HAVE_LIBGSSAPI, 1, [])
+-      AC_DEFINE(HAVE_LIBGSSAPI, 1, [])
 -      PKG_CHECK_MODULES(GSSGLUE, libgssglue, [],
 -      AC_MSG_ERROR([Unable to locate information required to use libgssglue.]))
-+      PKG_CHECK_MODULES([GSSGLUE], [libgssglue],
-+              [echo GSSGLUE found; GSSAPI_IMPLEMENTATION=libgssglue],
-+              [PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi],
-+              [echo HEIMDAL found; GSSAPI_IMPLEMENTATION=heimdal-gssapi],
-+      [AC_MSG_ERROR([Unable to locate information required to use libgssglue.])])])
++      AC_DEFINE(HAVE_LIBGSSAPI, 1, [Have GSSAPI])
++      PKG_CHECK_MODULES([GSSGLUE], [$GSSAPI_IMPLEMENTATION],
++              [echo GSSAPI in $GSSAPI_IMPLEMENTATION],
++              [PKG_CHECK_MODULES([GSSGLUE], [libgssglue],
++                      [echo GSSGLUE found; GSSAPI_IMPLEMENTATION=libgssglue],
++                      [PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi],
++                              [echo HEIMDAL found; GSSAPI_IMPLEMENTATION=heimdal-gssapi],
++                              [AC_MSG_ERROR([Unable to locate information required to use libgssglue.])])])])
 +AC_SUBST([GSSAPI_IMPLEMENTATION])
  fi
  
- 
+ AC_PROG_CC
 diff -ur libtirpc-0.1.10/libtirpc.pc.in libtirpc-0.1.10-heimdal/libtirpc.pc.in
 --- libtirpc-0.1.10/libtirpc.pc.in     2008-11-19 14:01:43.000000000 +0100
 +++ libtirpc-0.1.10-heimdal/libtirpc.pc.in     2009-06-30 14:55:59.811577076 +0200

diff --git a/libtirpc.spec b/libtirpc.spec
index 8ef08d78872ae801389a162afc665fd284fa9104..e3528b69ad46a8ede9ee22654a547c7782025437 100644 (file)
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with    krb5            # build with MIT Kerberos instead of Heimdal
+%bcond_with    gssglue         # build with MIT Kerberos instead of Heimdal
 #
 Summary:       Transport Independent RPC Library
 Summary(pl.UTF-8):     Biblioteka RPC niezależnego od transportu
@@ -10,23 +10,22 @@ Release:    1
 Epoch:         1
 License:       BSD-like
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/sourceforge/libtirpc/%{name}-%{version}.tar.bz2
+Source0:       http://downloads.sourceforge.net/libtirpc/%{name}-%{version}.tar.bz2
 # Source0-md5: d77eb15f464bf9d6e66259eaf78b2a4e
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-heimdal.patch
 Patch2:                %{name}-XDR_GETPOS.patch
 URL:           http://sourceforge.net/projects/libtirpc/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-%if %{with krb5}
+%if %{with gssglue}
 BuildRequires: libgssglue-devel >= 0.1
 %else
 BuildRequires: heimdal-devel
-BuildConflicts:        libgssglue-devel
 %endif
 BuildRequires: libtool
 BuildRequires: pkgconfig
-%if %{with krb5}
+%if %{with gssglue}
 Requires:      libgssglue >= 0.1
 %else
 Requires:      heimdal-libs
@@ -62,7 +61,7 @@ Summary:      Development files for the TI-RPC library
 Summary(pl.UTF-8):     Pliki programistyczne biblioteki TI-RPC
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-%if %{with krb5}
+%if %{with gssglue}
 Requires:      libgssglue-devel >= 0.1
 %else
 Requires:      heimdal-devel
@@ -101,7 +100,7 @@ Ten pakiet zawiera statyczną bibliotekę TI-RPC.
 %{__autoheader}
 %{__automake}
 %configure \
-       --enable-gss
+       --enable-gss=%{?with_gssglue:libgssglue}%{!?with_gssglue:heimdal-gssapi}
 
 %{__make}