rpms/smbldap-tools/devel smbldap-tools-0.9.2-config.patch, 1.1, 1.2 smbldap-tools.spec, 1.2, 1.3

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/extras/rpms/smbldap-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2590

Modified Files:
	smbldap-tools-0.9.2-config.patch smbldap-tools.spec 
Log Message:
Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
A consequence of this is that the package can no longer be noarch
Install smbldap_tools.pm without unnecessary exec bits
Fix example idmapdn entry in config file


smbldap-tools-0.9.2-config.patch:

Index: smbldap-tools-0.9.2-config.patch
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/devel/smbldap-tools-0.9.2-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smbldap-tools-0.9.2-config.patch	24 Mar 2006 07:15:06 -0000	1.1
+++ smbldap-tools-0.9.2-config.patch	24 Oct 2006 07:35:18 -0000	1.2
@@ -1,5 +1,5 @@
---- smbldap.conf	2006-01-27 10:52:27.000000000 +0000
-+++ smbldap.conf	2006-01-27 11:34:20.000000000 +0000
+--- smbldap.conf	2006-10-24 08:06:27.000000000 +0100
++++ smbldap.conf	2006-10-24 08:08:46.000000000 +0100
 @@ -34,12 +34,12 @@
  
  # Put your own SID. To obtain this number do: "net getlocalsid".
@@ -43,7 +43,7 @@
  
  # Where are stored Computers
  # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG"
-@@ -112,7 +112,7 @@
+@@ -112,10 +112,10 @@
  # Where are stored Groups
  # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG"
  # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn
@@ -51,4 +51,8 @@
 +groupsdn="ou=Group,${suffix}"
  
  # Where are stored Idmap entries (used if samba is a domain member server)
- # Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
+-# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
++# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG"
+ # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn
+ idmapdn="ou=Idmap,${suffix}"
+ 


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/devel/smbldap-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smbldap-tools.spec	22 Sep 2006 11:21:25 -0000	1.2
+++ smbldap-tools.spec	24 Oct 2006 07:35:18 -0000	1.3
@@ -1,16 +1,21 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://samba.idealx.org/index.en.html
 Source:		http://samba.idealx.org/dist/smbldap-tools-%{version}.tgz
 Patch0:		smbldap-tools-0.9.2-config.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildArch:	noarch
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+# perl(Unicode::MapUTF8) not available on x86_64, see bugs #182514 and #211866
+#BuildArch:	noarch
+ExcludeArch:	x86_64
+# Debuginfo package would be empty as there are no binaries in this package
+%define debug_package %{nil}
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -36,7 +41,7 @@
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
 %{__install} -d -m0755 %{buildroot}%{perl_vendorlib}
 %{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}
-%{__install} -p -m0755 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
+%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
 %{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf
 %{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf
 
@@ -64,6 +69,12 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Mon Oct 23 2006 Paul Howarth <paul at city-fan.org> 0.9.2-4
+- Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
+- A consequence of this is that the package can no longer be noarch
+- Install smbldap_tools.pm without unnecessary exec bits
+- Fix example idmapdn entry in config file
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 0.9.2-3
 - Require IO::Socket::SSL to ensure we have SSL support even if perl-LDAP
   doesn't enforce this dependency (#122066, #207430)
@@ -82,7 +93,7 @@
 * Tue Jan 17 2006 Paul Howarth <paul at city-fan.org> 0.9.1-2
 - Unpack tarball quietly
 - Clean up file list
-- Put smbldap_tools.pm in %{perl_vendorlib} rather than %{_sbindir}
+- Put smbldap_tools.pm in %%{perl_vendorlib} rather than %%{_sbindir}
 - Add %%{?dist} tag
 
 * Sat Jun 04 2005 Dag Wieers <dag at wieers.com> - 0.9.1-1 - 3108+/dag