rpms/dirmngr/devel dirmngr.spec,1.20,1.21 ldapservers.conf,1.1,1.2

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/dirmngr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8162

Modified Files:
	dirmngr.spec ldapservers.conf 
Log Message:
* Mon Jan 11 2010 Tomas Mraz <tmraz at redhat.com> - 1.0.3-5
- better ldapservers.conf file
- correct the license field



Index: dirmngr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dirmngr/devel/dirmngr.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- dirmngr.spec	8 Dec 2009 21:29:24 -0000	1.20
+++ dirmngr.spec	11 Jan 2010 16:10:13 -0000	1.21
@@ -1,12 +1,12 @@
 
 # Fedora Review: http://bugzilla.redhat.com/171289
 
-Name:	 dirmngr 
+Name:	 dirmngr
 Summary: Client for Managing/Downloading CRLs
 Version: 1.0.3
-Release: 4%{?dist} 
+Release: 5%{?dist}
 
-License: GPLv2+
+License: GPLv2+ and GPLv3+ and OpenLDAP
 Group:	 System Environment/Libraries
 URL:	 http://www.gnupg.org/
 Source0: ftp://ftp.gnupg.org/gcrypt/dirmngr/dirmngr-%{version}.tar.bz2
@@ -23,7 +23,7 @@ BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libassuan-static, libassuan-devel
 BuildRequires: libgcrypt-devel >= 1.2.0
-BuildRequires: libksba-devel >= 1.0.0 
+BuildRequires: libksba-devel >= 1.0.0
 BuildRequires: openldap-devel
 BuildRequires: pth-devel
 
@@ -58,7 +58,7 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 # dirs
 mkdir -p %{buildroot}%{_sysconfdir}/dirmngr/trusted-certs
@@ -96,7 +96,7 @@ fi
 
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
@@ -120,6 +120,10 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Jan 11 2010 Tomas Mraz <tmraz at redhat.com> - 1.0.3-5
+- better ldapservers.conf file
+- correct the license field
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0.3-4
 - Explicitly BR libassuan-static in accordance with the Packaging
   Guidelines (libassuan-devel is still static-only).


Index: ldapservers.conf
===================================================================
RCS file: /cvs/pkgs/rpms/dirmngr/devel/ldapservers.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ldapservers.conf	26 Jun 2006 19:04:29 -0000	1.1
+++ ldapservers.conf	11 Jan 2010 16:10:13 -0000	1.2
@@ -1,4 +1,15 @@
 ## ldapservers.conf
-# not sure exactly what file this is for, but
-# dirmngr (sometimes? maybe only in --daemon mode?) simply
-# won't run without it
+#  A list of LDAP servers to be contacted.
+#
+#  The format is line oriented where empty lines and lines starting
+#  with a hash mark are ignored.  All other lines are
+#  assumed to be colon seprated with these fields:
+#
+#  1. field: Hostname
+#  2. field: Portnumber
+#  3. field: Username
+#  4. field: Password
+#  5. field: Base DN
+#
+#  Example:
+#  ldap.example.com:389:exampleuser:examplepassword:dc=example,dc=com