From fb8ec506cae5db60be2bf9c58c0c2e7f54e4308c Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Tue, 3 Nov 2009 04:42:35 +0000
Subject: [PATCH 1/3] Initialize branch EL-4 for 389-admin-console

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..6ec5cef
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+EL-4

From e06e113e7d400290da85c6f810eb577e62973baa Mon Sep 17 00:00:00 2001
From: Richard Allen Megginson <rmeggins@fedoraproject.org>
Date: Fri, 25 Jun 2010 19:26:01 +0000
Subject: [PATCH 2/3] the 1.1.5 release

---
 .cvsignore             | 2 +-
 389-admin-console.spec | 7 +++++--
 sources                | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8805f0c..02726e2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-389-admin-console-1.1.4.tar.bz2
+389-admin-console-1.1.5.tar.bz2
diff --git a/389-admin-console.spec b/389-admin-console.spec
index 9062537..1abbab2 100644
--- a/389-admin-console.spec
+++ b/389-admin-console.spec
@@ -1,12 +1,12 @@
 %define major_version 1.1
-%define minor_version 4
+%define minor_version 5
 
 %define shortname 389-admin
 %define pkgname dirsrv
 
 Name: 389-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: 389 Admin Server Management Console
 
 Group: Applications/System
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Wed Jun  2 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.5-1
+- the 1.1.5 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 7423bfb..66b3eb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55c661be949c27b9ff2f754abbc2607f  389-admin-console-1.1.4.tar.bz2
+14bc2716b57bc4e79128548234850179  389-admin-console-1.1.5.tar.bz2

From 1ec9c32fe42a84ad4c12f30709b6dd95727c7fed Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 08:43:43 +0000
Subject: [PATCH 3/3] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 import.log               |  1 -
 4 files changed, 23 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 3a6f205..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: 389-admin-console
-# $Id$
-NAME := 389-admin-console
-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 $$/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)
diff --git a/branch b/branch
deleted file mode 100644
index 6ec5cef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-EL-4
diff --git a/import.log b/import.log
deleted file mode 100644
index 09c8bf4..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-89-admin-console-1_1_4-1:HEAD:389-admin-console-1.1.4-1.src.rpm:1247850936