[166723] Need version number change for 7.1SP1

Results applying brandver script to update the version numbers.

28 files changed, 41 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index e73ca9ea..cc12ee41 100644
--- a/Makefile
+++ b/Makefile
@@ -206,9 +206,14 @@ brandDirectory: $(RELTOOLSPATH)/brandver.pl
 	$(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec
 	@echo ==== Finished Branding LDAP Server ==========
 
+debrandDirectory: $(RELTOOLSPATH)/brandver.pl
+	@echo ==== Debranding LDAP Server ==========
+	$(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec
+	@echo ==== Finished Debranding LDAP Server ==========
+
 normalizeDirectory: $(RELTOOLSPATH)/brandver.pl
 	@echo ==== Normalizing LDAP Server ==========
-	$(RELTOOLSPATH)/brandver.pl -i branding/rhds/normalize.dat -s redhat-ds.spec
+	$(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec
 	@echo ==== Normalizing Branding LDAP Server ==========
 
 buildAndPkgDirectory:	buildDirectory pkgDirectory
diff --git a/include/version.h b/include/version.h
index f8520232..b0120da8 100644
--- a/include/version.h
+++ b/include/version.h
@@ -44,9 +44,9 @@
    exist, the PRODUCT_VERSION define has _DEF appended.
  */
 
-#define DIRECTORY_VERSION_DEF "7.1"
+#define DIRECTORY_VERSION_DEF "7.1 SP1"
 #define DIRECTORY_COMPATIBLE "3.0"
-#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1"
+#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1 SP1"
 
 #define DS_VERSION_DEF DIRECTORY_VERSION_DEF
 #define DS_VERSION_STRING DIRECTORY_VERSION_STRING
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index 1f31e359..a4800df6 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -106,9 +106,9 @@ endif
 endif
 
 ifdef USE_64
-VERSION=-ver 7.1-64bit
+VERSION=-ver 7.1SP1-64bit
 else
-VERSION=-ver 7.1
+VERSION=-ver 7.1SP1
 endif
 
 ifeq ($(ARCH), HPUX)
@@ -257,7 +257,7 @@ PACKAGE_SETUP_LIBS_32=$(subst $(NS64TAG),,$(PACKAGE_SETUP_LIBS))
 ifdef BUILD_RPM
 # name and version of RPM - must correspond to the spec file - these get branded
 	RPM_BASE_NAME=fedora
-	RPM_VERSION=7.1
+	RPM_VERSION=7.1SP1
 	RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION)
 	RPM_ARCH = $(shell uname -i)
 # root dir for RPM built and temp files
diff --git a/ldap/cm/newinst/Makefile b/ldap/cm/newinst/Makefile
index 739dc59f..e8b7ac3f 100644
--- a/ldap/cm/newinst/Makefile
+++ b/ldap/cm/newinst/Makefile
@@ -177,10 +177,10 @@ $(BINDEST)/ns-config: $(OBJS1) $(OBJS2)
 
 ifeq ($(ARCH), WINNT)
 $(INFO):
-	$(PERL) fixINF.pl $(BUILD_MODULE) $(DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "bin/admin/ns-admin,bin/admin/ns-admin.so"
+	$(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "bin/admin/ns-admin,bin/admin/ns-admin.so"
 else
 $(INFO):
-	$(PERL) fixINF.pl $(BUILD_MODULE) $(DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
+	$(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
 endif
 
 $(OBJDEST)/%.o: %.c
diff --git a/ldap/cm/newinstnt/Makefile b/ldap/cm/newinstnt/Makefile
index 0210c0ed..762714fd 100644
--- a/ldap/cm/newinstnt/Makefile
+++ b/ldap/cm/newinstnt/Makefile
@@ -117,7 +117,7 @@ $(OUTDIR)/%.obj: %.c
 	$(CC) $(CFLAGS) $<
 
 $(OUTDIR)/%.inf: %.inf
-	$(PERL) $(FIXINF) $(BUILD_MODULE) $(DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat $< $(SECURITY) "DoesntOnNT" $(IS_DIR_LITE) '$(INSTANCE_NAME_PREFIX)' $@ $(BUILD_BOMB)
+	$(PERL) $(FIXINF) $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat $< $(SECURITY) "DoesntOnNT" $(IS_DIR_LITE) '$(INSTANCE_NAME_PREFIX)' $@ $(BUILD_BOMB)
 
 $(OUTDIR)/%.res: %.rc
 	$(RC) $(RCFLAGS) /fo"$@" $<
diff --git a/ldap/cm/newinstnt/dsinst.rc b/ldap/cm/newinstnt/dsinst.rc
index 68ef807b..f878f9f2 100644
--- a/ldap/cm/newinstnt/dsinst.rc
+++ b/ldap/cm/newinstnt/dsinst.rc
@@ -89,7 +89,7 @@ BEGIN
             VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc.  Portions copyright 1999, 2002 Netscape Communications Corporation.  All rights reserved.\0"
             VALUE "OriginalFilename", "\0"
             VALUE "ProductName", "Fedora Server Products\0"
-            VALUE "ProductVersion", "7, 1, 0, 0\0"
+            VALUE "ProductVersion", "7, 1, 1, 0\0"
         END
     END
     BLOCK "VarFileInfo"
@@ -190,7 +190,7 @@ END
 IDD_SUITESPOTID DIALOG DISCARDABLE  0, 0, 297, 163
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION 
-"Directory Server 7.0 Fedora configuration directory server administrator "
+"Directory Server 7.1 Fedora configuration directory server administrator "
 
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -489,7 +489,7 @@ END
 IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE  0, 0, 297, 163
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION 
-"Directory Server 7.0 Fedora configuration directory server administrator "
+"Directory Server 7.1 Fedora configuration directory server administrator "
 
 FONT 8, "MS Sans Serif"
 BEGIN
diff --git a/ldap/docs/README.txt b/ldap/docs/README.txt
index 1cf5dcae..f70f7641 100644
--- a/ldap/docs/README.txt
+++ b/ldap/docs/README.txt
@@ -8,4 +8,4 @@ license agreement file called LICENSE.txt.
 Late-breaking news and information on the Fedora Directory Server is
 available at the following location:
 
-    http://fedora.redhat.com/
+    http://www.redhat.com/docs/manuals/
diff --git a/ldap/servers/ntds/wrapper/wix/ntds.wxs b/ldap/servers/ntds/wrapper/wix/ntds.wxs
index 8075ee70..47a1346d 100644
--- a/ldap/servers/ntds/wrapper/wix/ntds.wxs
+++ b/ldap/servers/ntds/wrapper/wix/ntds.wxs
@@ -38,11 +38,11 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
   <Product Name='Fedora Directory Synchronization' Id='9FABDEC3-CAA0-40D5-871F-A0E1759C38C1'
     Language='1033' Codepage='1252'
-    Version='1.0.0' Manufacturer='Fedora'>
+    Version='1.0.0' Manufacturer='Fedora Project'>
 
     <Package Id='????????-????-????-????-????????????' Keywords='Installer'
       Description="Fedora Directory Synchronization Installer"
-      Manufacturer='Fedora'
+      Manufacturer='Fedora Project'
       InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
     <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
diff --git a/ldap/servers/plugins/chainingdb/libcb.def b/ldap/servers/plugins/chainingdb/libcb.def
index b09ae61b..0a8a763c 100644
--- a/ldap/servers/plugins/chainingdb/libcb.def
+++ b/ldap/servers/plugins/chainingdb/libcb.def
@@ -38,7 +38,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Fedora Directory Server 7 Chaining Database Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Chaining Database Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/collation/collation.def b/ldap/servers/plugins/collation/collation.def
index 89ed7366..28b1b0da 100644
--- a/ldap/servers/plugins/collation/collation.def
+++ b/ldap/servers/plugins/collation/collation.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 7 Collation Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Collation Plugin'
 EXPORTS
 	orderingRule_init	@2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/cos/cos.def b/ldap/servers/plugins/cos/cos.def
index d22503ed..36a098d6 100644
--- a/ldap/servers/plugins/cos/cos.def
+++ b/ldap/servers/plugins/cos/cos.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 7 Class Of Service Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Class Of Service Plugin'
 EXPORTS
 	cos_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/distrib/libdistrib.def b/ldap/servers/plugins/distrib/libdistrib.def
index 09ce7c39..10f760b7 100644
--- a/ldap/servers/plugins/distrib/libdistrib.def
+++ b/ldap/servers/plugins/distrib/libdistrib.def
@@ -35,7 +35,7 @@
 ; Copyright (C) 2005 Red Hat, Inc.
 ; All rights reserved.
 ; --- END COPYRIGHT BLOCK ---
-DESCRIPTION 	'Fedora Directory Server 7 distribution logic example'
+DESCRIPTION 	'Fedora Directory Server 7.1 distribution logic example'
 EXPORTS
 	alpha_distribution @1
 	hash_distribution @2
diff --git a/ldap/servers/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def
index 3cdeefe6..1e327a7a 100644
--- a/ldap/servers/plugins/passthru/libpassthru.def
+++ b/ldap/servers/plugins/passthru/libpassthru.def
@@ -38,7 +38,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Fedora Directory Server 7 Pass Through Authentication Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Pass Through Authentication Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/presence/presence.def b/ldap/servers/plugins/presence/presence.def
index d0c407c1..59e16f02 100644
--- a/ldap/servers/plugins/presence/presence.def
+++ b/ldap/servers/plugins/presence/presence.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 7 Presence Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Presence Plugin'
 EXPORTS
 	presence_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/pwdstorage/libpwdstorage.def b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
index dd6f9a16..68bb650c 100644
--- a/ldap/servers/plugins/pwdstorage/libpwdstorage.def
+++ b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION		'Fedora Directory Server 7 password storage scheme Plugin'
+DESCRIPTION		'Fedora Directory Server 7.1 password storage scheme Plugin'
 EXPORTS
 	sha_pwd_storage_scheme_init @2
 	ssha_pwd_storage_scheme_init @3
diff --git a/ldap/servers/plugins/referint/referint.def b/ldap/servers/plugins/referint/referint.def
index b10ca812..3b332276 100644
--- a/ldap/servers/plugins/referint/referint.def
+++ b/ldap/servers/plugins/referint/referint.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 7 Referint Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Referint Plugin'
 CODE            SHARED READ EXECUTE
 DATA            SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/syntaxes/libsyntax.def b/ldap/servers/plugins/syntaxes/libsyntax.def
index 9ab16505..2e632384 100644
--- a/ldap/servers/plugins/syntaxes/libsyntax.def
+++ b/ldap/servers/plugins/syntaxes/libsyntax.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 7 syntaxes Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 syntaxes Plugin'
 EXPORTS
 	cis_init				@2
 	ces_init				@3
diff --git a/ldap/servers/plugins/uiduniq/libuiduniq.def b/ldap/servers/plugins/uiduniq/libuiduniq.def
index f8a116ad..f7912252 100644
--- a/ldap/servers/plugins/uiduniq/libuiduniq.def
+++ b/ldap/servers/plugins/uiduniq/libuiduniq.def
@@ -38,7 +38,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Fedora Directory Server 7 Unique Attribute Checking Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Unique Attribute Checking Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/slapd/test-plugins/testbind.c b/ldap/servers/slapd/test-plugins/testbind.c
index 08e12a0c..ae5c4c04 100644
--- a/ldap/servers/slapd/test-plugins/testbind.c
+++ b/ldap/servers/slapd/test-plugins/testbind.c
@@ -69,7 +69,7 @@
 #include <string.h>
 #include "slapi-plugin.h"
 
-Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "7.1",
+Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "7.1 SP1",
 	"sample bind pre-operation plugin" };
 
 static Slapi_ComponentId *plugin_id = NULL;
diff --git a/ldap/servers/slapd/test-plugins/testdatainterop.c b/ldap/servers/slapd/test-plugins/testdatainterop.c
index 2c871838..3b105a12 100644
--- a/ldap/servers/slapd/test-plugins/testdatainterop.c
+++ b/ldap/servers/slapd/test-plugins/testdatainterop.c
@@ -113,7 +113,7 @@
 /*
  * Static variables.
  */
-static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "7.1",
+static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "7.1 SP1",
 	"sample pre-operation null suffix plugin" };
 
 static Slapi_ComponentId *plugin_id = NULL;
diff --git a/ldap/servers/slapd/test-plugins/testentry.c b/ldap/servers/slapd/test-plugins/testentry.c
index fabb1a6e..3e568c30 100644
--- a/ldap/servers/slapd/test-plugins/testentry.c
+++ b/ldap/servers/slapd/test-plugins/testentry.c
@@ -90,7 +90,7 @@ nsslapd-pluginId: test-entry
 #include <string.h>
 #include "slapi-plugin.h"
 
-Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "7.1",
+Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "7.1 SP1",
 	"sample entry modification plugin" };
 
 /* Entry store plug-in function */
diff --git a/ldap/servers/slapd/test-plugins/testextendedop.c b/ldap/servers/slapd/test-plugins/testextendedop.c
index 5f5b638a..71c60c97 100644
--- a/ldap/servers/slapd/test-plugins/testextendedop.c
+++ b/ldap/servers/slapd/test-plugins/testextendedop.c
@@ -83,7 +83,7 @@
 /* OID of the extended operation handled by this plug-in */
 #define MY_OID	"1.2.3.4"
 
-Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "7.1",
+Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "7.1 SP1",
 	"sample extended operation plugin" };
 
 
diff --git a/ldap/servers/slapd/test-plugins/testgetip.c b/ldap/servers/slapd/test-plugins/testgetip.c
index 8867ee29..ef69026b 100644
--- a/ldap/servers/slapd/test-plugins/testgetip.c
+++ b/ldap/servers/slapd/test-plugins/testgetip.c
@@ -74,7 +74,7 @@
 #include "slapi-plugin.h"
 #include "nspr.h"
 
-Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "7.1",
+Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "7.1 SP1",
 	"sample pre-operation plugin" };
 
 static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen );
diff --git a/ldap/servers/slapd/test-plugins/testpostop.c b/ldap/servers/slapd/test-plugins/testpostop.c
index 7c82bf7f..74325b0a 100644
--- a/ldap/servers/slapd/test-plugins/testpostop.c
+++ b/ldap/servers/slapd/test-plugins/testpostop.c
@@ -93,7 +93,7 @@ static char changelogfile[MAX_PATH+1];
 static char *changelogfile = "/tmp/changelog";
 #endif
 
-Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "7.1",
+Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "7.1 SP1",
 	"sample post-operation plugin" };
 
 static void write_changelog( int optype, char *dn, void *change, int flag );
diff --git a/ldap/servers/slapd/test-plugins/testpreop.c b/ldap/servers/slapd/test-plugins/testpreop.c
index bc72dd03..c0f1f837 100644
--- a/ldap/servers/slapd/test-plugins/testpreop.c
+++ b/ldap/servers/slapd/test-plugins/testpreop.c
@@ -79,7 +79,7 @@
 #include <string.h>
 #include "slapi-plugin.h"
 
-Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "7.1",
+Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "7.1 SP1",
 	"sample pre-operation plugin" };
 
 /* Pre-operation plug-in function */
diff --git a/ldap/servers/slapd/test-plugins/testsaslbind.c b/ldap/servers/slapd/test-plugins/testsaslbind.c
index b259a80d..2be88604 100644
--- a/ldap/servers/slapd/test-plugins/testsaslbind.c
+++ b/ldap/servers/slapd/test-plugins/testsaslbind.c
@@ -80,7 +80,7 @@ nsslapd-plugindescription: sample SASL bind pre-operation plugin
 #include <string.h>
 #include "slapi-plugin.h"
 
-Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1",
+Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1 SP1",
 	"sample SASL bind pre-operation plugin" };
 
 
diff --git a/ldapserver.spec.tmpl b/ldapserver.spec.tmpl
index a00ed16a..bf184616 100644
--- a/ldapserver.spec.tmpl
+++ b/ldapserver.spec.tmpl
@@ -45,7 +45,7 @@
 Summary: @COMPANY-PRODUCT-NAME@
 Name: @LCASE-COMPANY-NAME-NOSP@-ds
 Version: @GEN-VERSION@
-Release: 2.@PLATFORM@
+Release: 3.@PLATFORM@
 License: GPL plus extensions
 Group: System Environment/Daemons
 URL: @COMPANY-URL@
diff --git a/nsdefs.mk b/nsdefs.mk
index abc53ec7..7660f35a 100644
--- a/nsdefs.mk
+++ b/nsdefs.mk
@@ -264,7 +264,8 @@ COMMON_OBJDIR_32=$(BUILD_ROOT)/built/$(ARCHPROCESSOR)-$(SECURITY)$(SSL_PREFIX)-$
 OBJDIR=$(COMMON_OBJDIR)
 OBJDIR_32=$(COMMON_OBJDIR_32)
 DO_SEARCH=no
-DIR_VERSION:=7.1
+DIR_VERSION:=7.1 SP1
+NOSP_DIR_VERSION:=7.1SP1
 DIR_NORM_VERSION:=7.1
 # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must
 # update all of the .exp and .def files by executing the following command: