Merge branch 'master' into f14

Conflicts:

	.gitignore
	389-adminutil.spec
	sources
This commit is contained in:
Rich Megginson 2010-10-19 10:54:18 -06:00
commit 0c0cd7ff1f
3 changed files with 6 additions and 4 deletions

3
.gitignore vendored
View file

@ -1,2 +1 @@
389-adminutil-1.1.10.tar.bz2
/389-adminutil-1.1.11.tar.bz2
389-adminutil-1.1.12.tar.bz2

View file

@ -1,6 +1,6 @@
Summary: Utility library for 389 administration
Name: 389-adminutil
Version: 1.1.11
Version: 1.1.12
Release: 1%{?dist}
License: LGPLv2
URL: http://port389.org/wiki/AdminUtil
@ -80,6 +80,9 @@ that use %{name}.
%{_includedir}/libadmsslutil
%changelog
* Tue Sep 28 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.12-1
- fix building with mozldap
* Tue Sep 28 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-1
- with openldap support

View file

@ -1 +1 @@
c772dc3fee1736798dd966ca847793d4 389-adminutil-1.1.11.tar.bz2
87fa5914b0582e209c0b2c1ce2e601b6 389-adminutil-1.1.12.tar.bz2