rpms/smbldap-tools/devel .cvsignore, 1.2, 1.3 smbldap-tools.spec, 1.4, 1.5 sources, 1.2, 1.3

[Paul Howarth (pghmcfc)]

Author: pghmcfc

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

Modified Files:
	.cvsignore smbldap-tools.spec sources 
Log Message:
- update URLs, as original upstream source is now dead
- apply useradd_option-o enhancement patch from upstream
- clarify license as GPL version 2 or later
- add openssl buildreq for detection of TLS cert/key directory



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2006 07:15:06 -0000	1.2
+++ .cvsignore	23 Aug 2007 15:18:40 -0000	1.3
@@ -1 +1,2 @@
-smbldap-tools-0.9.2.tgz
+smbldap-tools-0.9.2a.tgz
+smbldap-useradd_option-o_version2.tar.gz


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/smbldap-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smbldap-tools.spec	29 Oct 2006 14:25:57 -0000	1.4
+++ smbldap-tools.spec	23 Aug 2007 15:18:40 -0000	1.5
@@ -1,16 +1,18 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
-Version:	0.9.2
-Release:	5%{?dist}
-License:	GPL
+Version:	0.9.2a
+Release:	1%{?dist}
+License:	GPLv2+
 Group:		System Environment/Base
-URL:		http://samba.idealx.org/index.en.html
-Source:		http://samba.idealx.org/dist/smbldap-tools-%{version}.tgz
+URL:		http://sourceforge.net/projects/smbldap-tools/
+Source0:	http://downloads.sf.net/smbldap-tools/smbldap-tools-%{version}.tgz
+Source1:	http://downloads.sf.net/smbldap-tools/smbldap-useradd_option-o_version2.tar.gz
 Patch0:		smbldap-tools-0.9.2-config.patch
 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
+BuildRequires:	openssl
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -19,15 +21,25 @@
 groups and passwords.
 
 %prep
-%setup -q
+%setup -q -n smbldap-tools-0.9.2 -a 1
+%{__patch} -p0 < smbldap-useradd_option-o_version1.patch
 %{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g;
 		  s|/opt/IDEALX||g;' \
 	Makefile smb.conf smbldap.conf \
 	smbldap-populate smbldap_tools.pm configure.pl \
 	doc/html/*.html
 %patch0 -p0
-# Don't want this in %{_sbindir}...
+
+# Don't want these in %{_sbindir}...
 %{__mv} smbldap-tools.spec original-smbldap-tools.spec
+%{__mv} smbldap-useradd_option-o_version1.txt useradd-patch.txt
+%{__rm} smbldap-useradd_option-o_version1.patch
+
+# Figure out where ssl stuff goes
+%define use_pki %(if [ -f %{_sysconfdir}/pki/tls/certs/ca-bundle.crt ]; then echo 1; else echo 0; fi)
+%if ! %{use_pki}
+%{__perl} -pi -e 's|/etc/pki/tls/certs/|%{_datadir}/ssl/certs/|g;' smbldap.conf
+%endif
 
 %build
 
@@ -44,9 +56,9 @@
 %{__rm} -rf %{buildroot}
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc ChangeLog CONTRIBUTORS COPYING FILES INFRA INSTALL README TODO
-%doc configure.pl *.conf doc/*
+%doc configure.pl *.conf doc/* useradd-patch.txt
 %dir %{_sysconfdir}/smbldap-tools/
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap_bind.conf
@@ -64,6 +76,12 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 0.9.2a-1
+- update URLs, as original upstream source is now dead
+- apply useradd_option-o enhancement patch from upstream
+- clarify license as GPL version 2 or later
+- add openssl buildreq for detection of TLS cert/key directory
+
 * Sun Oct 29 2006 Paul Howarth <paul at city-fan.org> 0.9.2-5
 - perl(Unicode::MapUTF8) now available on x86_64, so remove ExcludeArch
   and revert to noarch package (#211866)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2006 07:15:06 -0000	1.2
+++ sources	23 Aug 2007 15:18:40 -0000	1.3
@@ -1 +1,2 @@
-bb8eb44adb4e7946de5b486acf480c24  smbldap-tools-0.9.2.tgz
+bb8eb44adb4e7946de5b486acf480c24  smbldap-tools-0.9.2a.tgz
+eb0ffa04c9ddfc8205524b298309141f  smbldap-useradd_option-o_version2.tar.gz