[Fedora-directory-commits] ldapserver Makefile, 1.27, 1.28 ldapserver.spec.tmpl, 1.15, 1.16

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile ldapserver.spec.tmpl 
Log Message:
Bug(s) fixed: 172818
Bug Description: Allow ldapserver rpm to be made externally
Reviewed by: Noriko (Thanks!)
Fix Description: Just use a simple sed command to replace the tokens in 
the spec.tmpl file.  Just assume Fedora branding for this.  For some 
reason, on FC4, the setup -b step does not work unless I added a second 
echo yes to the command.  The tar command used by the rpmbuild step must 
have all of the command line arguments before the directory to tar.  I 
moved some things around to make the rpm build process more dsbuild 
friendly.
Platforms tested: FC4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile	29 Oct 2005 02:25:50 -0000	1.27
+++ Makefile	10 Nov 2005 01:35:45 -0000	1.28
@@ -346,7 +346,18 @@
 	$(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat $@
 	mv $@ $(OBJDIR)
 
+ifdef INTERNAL_BUILD
 fedora-ds.spec: ldapserver.spec.tmpl branding/fedora/brandver.dat $(RELTOOLSPATH)/brandver.pl
 	sed -e s/@PLATFORM@/$(BUILD_ARCH)/g ldapserver.spec.tmpl > $@
 	$(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat $@
 	mv $@ $(OBJDIR)
+else
+fedora-ds.spec: ldapserver.spec.tmpl
+	sed -e s/@PLATFORM@/$(BUILD_ARCH)/g \
+	-e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \
+	-e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \
+	-e 's/@GEN-VERSION@/1.0/g' \
+	-e 's+ at COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
+	ldapserver.spec.tmpl > $@
+	mv $@ $(OBJDIR)
+endif # INTERNAL_BUILD


Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ldapserver.spec.tmpl	9 Nov 2005 21:10:44 -0000	1.15
+++ ldapserver.spec.tmpl	10 Nov 2005 01:35:45 -0000	1.16
@@ -76,7 +76,8 @@
 # all we do here is run setup -b to unpack the binaries
 # into the BuildRoot
 # the echo yes is for dsktune to continue
-echo yes | ./setup -b $RPM_BUILD_ROOT/%{prefix}
+# the second echo yes is for some platforms that need it
+(echo yes ; echo yes) | ./setup -b $RPM_BUILD_ROOT/%{prefix}
 
 %clean
 if [ -z "$RPM_INSTALL_PREFIX" ]; then