Merge branch 'f13' into f12

version 1.1.13 - add nss_inc to libadminutil build flags
2010-10-22 15:27:34 -06:00 · 2010-10-22 15:21:25 -06:00 · 2010-10-19 11:04:17 -06:00 · 2010-10-19 10:55:59 -06:00 · 2010-10-19 10:09:05 -06:00 · 2010-10-19 10:07:39 -06:00
6 changed files with 16 additions and 25 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-389-adminutil-1.1.9.tar.bz2
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+389-adminutil-1.1.13.tar.bz2
--- a/389-adminutil.spec
+++ b/389-adminutil.spec
@ -1,6 +1,6 @@
 Summary:          Utility library for 389 administration
 Name:             389-adminutil
-Version:          1.1.9
+Version:          1.1.13
 Release:          1%{?dist}
 License:          LGPLv2
 URL:              http://port389.org/wiki/AdminUtil
@ -82,6 +82,19 @@ that use %{name}.
 %{_includedir}/libadmsslutil

 %changelog
+* Fri Oct 22 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.13-1
+- add nss_inc to libadminutil build flags
+
+* Tue Oct 19 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.12-1
+- fix building with mozldap
+
+* Tue Oct 19 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-1
+- the 1.1.11 release
+
+* Fri Feb 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.10-1
+- Bug 460168 - FedoraDS' adminutil requires non-existent "icu.pc" on non-RH/Fedora systems
+- this is the 1.1.10 release
+
 * Thu Jan 14 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.9-1
 - make sure we can find ICU genrb on all platforms
 - this is the 1.1.9 release
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: 389-adminutil
-# $Id$
-NAME := 389-adminutil
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/import.log
+++ b/import.log
@ -1 +0,0 @@
-89-adminutil-1_1_8-2:HEAD:389-adminutil-1.1.8-2.src.rpm:1247864461
--- a/2
+++ b/2
@ -1 +1 @@
-da96a9673ac983b79475fd9c51b663c3  389-adminutil-1.1.9.tar.bz2
+5e0bbf95c6a61eb69b5f620b28336eff  389-adminutil-1.1.13.tar.bz2
Author	SHA1	Message	Date
Rich Megginson	9240648068	Merge branch 'f13' into f12	2010-10-22 15:27:34 -06:00
Rich Megginson	ddf5c01cac	version 1.1.13 - add nss_inc to libadminutil build flags version 1.1.13 - add nss_inc to libadminutil build flags	2010-10-22 15:21:25 -06:00
Rich Megginson	203dc77f46	Merge branch 'f13' into f12	2010-10-19 11:04:17 -06:00
Rich Megginson	1128364067	bump version to 1.1.12	2010-10-19 10:55:59 -06:00
Rich Megginson	d79f1b6d05	Merge branch 'f13' into f12 Conflicts: .gitignore 389-adminutil.spec sources	2010-10-19 10:09:05 -06:00
Rich Megginson	2f530354fd	bump version to 1.1.11	2010-10-19 10:07:39 -06:00
Fedora Release Engineering	c0ccaab28a	dist-git conversion	2010-07-28 08:43:52 +00:00
Fedora Release Engineering	5a437500ce	dist-git conversion	2010-07-28 08:43:51 +00:00
Richard Allen Megginson	474e19c650	this is the 1.1.10 release - Bug 460168 - FedoraDS adminutil requires non-existent icu.pc on non-RH/Fedora systems	2010-02-27 01:44:19 +00:00
Richard Allen Megginson	cb46bca2c2	this is the 1.1.10 release - Bug 460168 - FedoraDS adminutil requires non-existent icu.pc on non-RH/Fedora systems	2010-02-27 01:44:19 +00:00
Jesse Keating	c6fd328b7f	Initialize branch F-13 for 389-adminutil	2010-02-17 00:45:27 +00:00
Richard Allen Megginson	1b7a3420e6	this is the 1.1.9 release - fix ICU genrb related build problems	2010-01-14 21:47:09 +00:00
Bill Nottingham	1e8820920e	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-25 23:49:51 +00:00
Toshio くらとみ	99d4268ec7	Initialize branch F-12 for 389-adminutil	2009-09-29 16:10:10 +00:00
				`@ -1 +0,0 @@`
				`89-adminutil-1_1_8-2:HEAD:389-adminutil-1.1.8-2.src.rpm:1247864461`