packages: librpcsecgss/librpcsecgss.spec, librpcsecgss/librpcsecgss-heimdal...

[baggins]

Author: baggins                      Date: Tue Jun 30 13:06:36 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- added heimdal bcond and patch allowing to use heimdal-gssapi in place
  of libgssglue (patch from gentoo)

---- Files affected:
packages/librpcsecgss:
   librpcsecgss.spec (1.23 -> 1.24) , librpcsecgss-heimdal.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/librpcsecgss/librpcsecgss.spec
diff -u packages/librpcsecgss/librpcsecgss.spec:1.23 packages/librpcsecgss/librpcsecgss.spec:1.24
--- packages/librpcsecgss/librpcsecgss.spec:1.23	Sat May 31 18:07:45 2008
+++ packages/librpcsecgss/librpcsecgss.spec	Tue Jun 30 15:06:31 2009
@@ -1,17 +1,27 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	heimdal		# build with Heimdal Kerberos instead of MIT
+#
 Summary:	rpcsec_gss implementation library
 Summary(pl.UTF-8):	Biblioteka implementująca rpcsec_gss
 Name:		librpcsecgss
 Version:	0.18
-Release:	1
+Release:	2
 License:	BSD/MIT
 Group:		Libraries
 Source0:	http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{name}-%{version}.tar.gz
 # Source0-md5:	f2c4a69c5a32f62b762a569b8d962156
+Patch0:		%{name}-heimdal.patch
 URL:		http://www.citi.umich.edu/projects/nfsv4/linux/
 BuildRequires:	autoconf >= 2.59
 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
@@ -52,6 +62,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -96,6 +107,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2009/06/30 13:06:31  baggins
+- rel 2
+- added heimdal bcond and patch allowing to use heimdal-gssapi in place
+  of libgssglue (patch from gentoo)
+
 Revision 1.23  2008/05/31 16:07:45  qboosh
 - updated to 0.18
 

================================================================
Index: packages/librpcsecgss/librpcsecgss-heimdal.patch
diff -u /dev/null packages/librpcsecgss/librpcsecgss-heimdal.patch:1.5
--- /dev/null	Tue Jun 30 15:06:37 2009
+++ packages/librpcsecgss/librpcsecgss-heimdal.patch	Tue Jun 30 15:06:31 2009
@@ -0,0 +1,33 @@
+diff -NaurwB librpcsecgss-0.18.orig/configure.in librpcsecgss-0.18/configure.in
+--- librpcsecgss-0.18.orig/configure.in	2008-04-09 00:05:40.000000000 +0200
++++ librpcsecgss-0.18/configure.in	2008-06-12 19:05:51.000000000 +0200
+@@ -12,10 +12,15 @@
+ AC_PROG_RANLIB
+ 
+ # Checks for libraries.
+-PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1], [],
++PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1],
++  [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.
+   If you have pkgconfig installed, you might try setting environment
+-  variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])
++    variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])])
++
++AC_SUBST([GSSAPI_IMPLEMENTATION])
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+diff -NaurwB librpcsecgss-0.18.orig/librpcsecgss.pc.in librpcsecgss-0.18/librpcsecgss.pc.in
+--- librpcsecgss-0.18.orig/librpcsecgss.pc.in	2007-09-06 17:39:04.000000000 +0200
++++ librpcsecgss-0.18/librpcsecgss.pc.in	2008-06-12 19:06:40.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ Name: librpcsecgss
+ Description: Library that implements rpcsec_gss interface.
+-Requires: libgssglue
++Requires: @GSSAPI_IMPLEMENTATION@
+ Version: @PACKAGE_VERSION@
+ Libs: -L at libdir@ -lrpcsecgss
+ Cflags: -I at includedir@/rpcsecgss
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/librpcsecgss/librpcsecgss.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/librpcsecgss/librpcsecgss-heimdal.patch?r1=1.4&r2=1.5&f=u