[Fedora-directory-commits] ldapserver Makefile, 1.24, 1.24.2.1 ldapserver.spec.tmpl, 1.10, 1.10.2.1 nsdefs.mk, 1.11, 1.11.2.1

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21078

Modified Files:
      Tag: Directory71RtmBranch
	Makefile ldapserver.spec.tmpl nsdefs.mk 
Log Message:
[166723] Need version number change for 7.1SP1
Results applying brandver script to update the version numbers.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- Makefile	16 May 2005 03:10:04 -0000	1.24
+++ Makefile	31 Aug 2005 21:40:45 -0000	1.24.2.1
@@ -206,9 +206,14 @@
 	$(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


Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- ldapserver.spec.tmpl	10 May 2005 20:49:43 -0000	1.10
+++ ldapserver.spec.tmpl	31 Aug 2005 21:40:45 -0000	1.10.2.1
@@ -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@


Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- nsdefs.mk	19 Apr 2005 22:06:42 -0000	1.11
+++ nsdefs.mk	31 Aug 2005 21:40:45 -0000	1.11.2.1
@@ -264,7 +264,8 @@
 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: