From 1a889ce5c73839c861b71ac88803dd0c54730a7a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:49:51 +0000 Subject: [PATCH 1/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8cba13d..78a7494 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: 389-ds -# $Id$ +# $Id: Makefile,v 1.1 2009/07/17 20:54:32 ausil Exp $ NAME := 389-ds 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 +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)) From 16cf54630e065f32aa61ac3f239611c620617020 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 2 Mar 2010 22:21:34 +0000 Subject: [PATCH 2/6] 1.2.0 release - added selinux subpackages for 389-ds-base and 389-admin --- 389-ds.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/389-ds.spec b/389-ds.spec index 7a6c4cb..0c0d63a 100644 --- a/389-ds.spec +++ b/389-ds.spec @@ -1,7 +1,7 @@ Summary: 389 Directory, Administration, and Console Suite Name: 389-ds -Version: 1.1.3 -Release: 5%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: GPLv2 URL: http://port389.org/ Group: System Environment/Daemons @@ -13,7 +13,9 @@ Obsoletes: fedora-ds < 1.1.3-2 Source: LICENSE Requires: 389-ds-base +Requires: 389-ds-base-selinux Requires: 389-admin +Requires: 389-admin-selinux Requires: idm-console-framework Requires: 389-console Requires: 389-ds-console @@ -44,8 +46,8 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog -* Wed Aug 12 2009 Rich Megginson 1.1.3-5 -- added doc subpackages +* Mon Mar 2 2010 Rich Megginson 1.2.0-1 +- added selinux subpackages * Fri Jul 24 2009 Fedora Release Engineering - 1.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From b1db6b2791d607afa6c67fa39c6c0b1cd0f09dc7 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 15 Apr 2010 17:44:21 +0000 Subject: [PATCH 3/6] this is the 1.2.1 release --- 389-ds.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/389-ds.spec b/389-ds.spec index 0c0d63a..b8fe73f 100644 --- a/389-ds.spec +++ b/389-ds.spec @@ -1,6 +1,6 @@ Summary: 389 Directory, Administration, and Console Suite Name: 389-ds -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} License: GPLv2 URL: http://port389.org/ @@ -13,9 +13,7 @@ Obsoletes: fedora-ds < 1.1.3-2 Source: LICENSE Requires: 389-ds-base -Requires: 389-ds-base-selinux Requires: 389-admin -Requires: 389-admin-selinux Requires: idm-console-framework Requires: 389-console Requires: 389-ds-console @@ -46,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Thu Apr 15 2010 Rich Megginson 1.2.1-1 +- removed selinux subpackages - the selinux policy is now provided +- by the main 389-ds-base and 389-admin packages + * Mon Mar 2 2010 Rich Megginson 1.2.0-1 - added selinux subpackages From b649e038ce5ded778e569256f63e1777fde3a906 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:41:01 +0000 Subject: [PATCH 4/6] Initialize branch EL-6 for 389-ds --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From cbe84f728c27b2c7d1af445eb80bd4e245389cc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:44:12 +0000 Subject: [PATCH 5/6] 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 78a7494..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 389-ds -# $Id: Makefile,v 1.1 2009/07/17 20:54:32 ausil Exp $ -NAME := 389-ds -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) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index d799f90..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -89-ds-1_1_3-2:HEAD:389-ds-1.1.3-2.src.rpm:1247865158 From 68aab9997c9b9db3530a4c97404414be5a2191d2 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 1 Jun 2011 16:10:52 -0600 Subject: [PATCH 6/6] get rid of old fedora-ds stuff (cherry picked from commit 981911e789e4d60e0ef6a20aa9f336ef41af5fb4) (cherry picked from commit 2d1deb0461055641e84982cdb1e8ecc765e6c4c1) --- 389-ds.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/389-ds.spec b/389-ds.spec index b8fe73f..5ef99cd 100644 --- a/389-ds.spec +++ b/389-ds.spec @@ -1,14 +1,12 @@ Summary: 389 Directory, Administration, and Console Suite Name: 389-ds -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} License: GPLv2 URL: http://port389.org/ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Provides: fedora-ds = %{version}-%{release} -Obsoletes: fedora-ds < 1.1.3-2 Source: LICENSE @@ -44,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Wed Jun 1 2011 Rich Megginson 1.2.2-1 +- get rid of old fedora-ds stuff + * Thu Apr 15 2010 Rich Megginson 1.2.1-1 - removed selinux subpackages - the selinux policy is now provided - by the main 389-ds-base and 389-admin packages