- rel 6

- added heimdal bcond and patch allowing to use heimdal-gssapi in place of libgssglue

Changed files:
    libtirpc-heimdal.patch -> 1.1
    libtirpc.spec -> 1.18

diff --git a/libtirpc-heimdal.patch b/libtirpc-heimdal.patch
new file mode 100644 (file)
index 0000000..70f60c6
--- /dev/null
+++ b/libtirpc-heimdal.patch
@@ -0,0 +1,30 @@
+diff -ur libtirpc-0.1.10/configure.in libtirpc-0.1.10-heimdal/configure.in
+--- libtirpc-0.1.10/configure.in       2008-11-19 14:01:43.000000000 +0100
++++ libtirpc-0.1.10-heimdal/configure.in       2009-06-30 14:52:36.541185534 +0200
+@@ -11,8 +11,12 @@
+       esac],[gss=false])
+ AM_CONDITIONAL(GSS, test x$gss = xtrue)
+ if test x$gss = xtrue; then
+-      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_SUBST([GSSAPI_IMPLEMENTATION])
+ fi
+ 
+ 
+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
+@@ -5,7 +5,7 @@
+ 
+ Name: libtirpc
+ Description: Transport Independent RPC Library
+-Requires:
++Requires: @GSSAPI_IMPLEMENTATION@
+ Version: @PACKAGE_VERSION@
+ Libs: -L@libdir@ -ltirpc
+ Cflags: -I@includedir@/tirpc

diff --git a/libtirpc.spec b/libtirpc.spec
index f6eb53a1994406ba3c6bea316f620045997cfc03..4eb8e0eaa671aa6c6aea4ef126d5758b42ffa724 100644 (file)
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -1,8 +1,12 @@
+#
+# Conditional build:
+%bcond_with    heimdal         # build with Heimdal Kerberos instead of MIT
+#
 Summary:       Transport Independent RPC Library
 Summary(pl.UTF-8):     Biblioteka RPC niezależnego od transportu
 Name:          libtirpc
 Version:       0.1.10
-Release:       5
+Release:       6
 Epoch:         1
 License:       BSD-like
 Group:         Libraries
@@ -10,10 +14,16 @@ Source0:    http://dl.sourceforge.net/sourceforge/libtirpc/%{name}-%{version}.tar.b
 # Source0-md5: 4192ad1c683abb7eb2ca77d5fd64e54b
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-git.patch
+Patch2:                %{name}-heimdal.patch
 URL:           http://sourceforge.net/projects/libtirpc/
 BuildRequires: autoconf
 BuildRequires: automake
+%if %{with heimdal}
+BuildRequires: heimdal-devel
+BuildConflicts:        libgssglue-devel
+%else
 BuildRequires: libgssglue-devel >= 0.1
+%endif
 BuildRequires: libtool
 BuildRequires: pkgconfig
 Requires:      libgssglue >= 0.1
@@ -74,6 +84,7 @@ Ten pakiet zawiera statyczną bibliotekę TI-RPC.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}