rpms/slapi-nis/F-9 slapi-nis-paths.patch, NONE, 1.1 slapi-nis.spec, 1.5, 1.6

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/pkgs/rpms/slapi-nis/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30983/F-9

Modified Files:
	slapi-nis.spec 
Added Files:
	slapi-nis-paths.patch 
Log Message:
- make the example ldif files multilib safe by assuming that omitting the
  directory is safe because the plugin will be installed where the server
  will be looking for it


slapi-nis-paths.patch:

--- NEW FILE slapi-nis-paths.patch ---
Take advantage of the server's ability to prepend the right directory name
and append the right extension to make the resulting file multilib-safe.

diff -ru slapi-nis-0.8.5/doc/nis-plugin.ldif.in slapi-nis-0.8.5/doc/nis-plugin.ldif.in
--- slapi-nis-0.8.5/doc/nis-plugin.ldif.in	2008-12-08 14:00:53.000000000 -0500
+++ slapi-nis-0.8.5/doc/nis-plugin.ldif.in	2008-12-09 11:18:13.000000000 -0500
@@ -3,7 +3,7 @@
 objectclass: nsSlapdPlugin
 objectclass: extensibleObject
 cn: NIS Server
-nsslapd-pluginpath: @myplugindir@/nisserver-plugin.so
+nsslapd-pluginpath: nisserver-plugin
 nsslapd-plugininitfunc: nis_plugin_init
 nsslapd-plugintype: object
 nsslapd-pluginenabled: on
diff -ru slapi-nis-0.8.5/doc/sch-plugin.ldif.in slapi-nis-0.8.5/doc/sch-plugin.ldif.in
--- slapi-nis-0.8.5/doc/sch-plugin.ldif.in	2008-12-08 14:00:53.000000000 -0500
+++ slapi-nis-0.8.5/doc/sch-plugin.ldif.in	2008-12-09 11:18:21.000000000 -0500
@@ -3,7 +3,7 @@
 objectclass: nsSlapdPlugin
 objectclass: extensibleObject
 cn: Schema Compatibility
-nsslapd-pluginpath: @myplugindir@/schemacompat-plugin.so
+nsslapd-pluginpath: schemacompat-plugin
 nsslapd-plugininitfunc: schema_compat_plugin_init
 nsslapd-plugintype: object
 nsslapd-pluginenabled: on


Index: slapi-nis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-9/slapi-nis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- slapi-nis.spec	8 Dec 2008 19:07:31 -0000	1.5
+++ slapi-nis.spec	9 Dec 2008 16:44:20 -0000	1.6
@@ -1,11 +1,12 @@
 Name:		slapi-nis
 Version:	0.8.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
 License:	GPLv2
 URL:		http://slapi-nis.fedorahosted.org/
 Source0:	https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz
+Patch0:		slapi-nis-paths.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	fedora-ds-base-devel, mozldap-devel, tcp_wrappers-devel
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .paths
 
 %build
 %configure --disable-static --with-tcp-wrappers
@@ -46,6 +48,11 @@
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Tue Dec  9 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-2
+- make the example nsslapd-pluginpath values the same on 32- and 64-bit
+  systems, because we can depend on the directory server "knowing" which
+  directory to search for the plugins
+
 * Mon Dec  8 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-1
 - update to 0.8.5 to suppress duplicate values for attributes in the schema
   compatibility plugin