[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.2, 1.30.2.3
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12687/ldap/cm
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
168222 - Added xorg-x11-deprecated-libs dependency for RHEL4
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -u -r1.30.2.2 -r1.30.2.3
--- Makefile 10 Sep 2005 00:41:46 -0000 1.30.2.2
+++ Makefile 13 Sep 2005 17:22:04 -0000 1.30.2.3
@@ -285,6 +285,12 @@
RPM_RPMDIR = --define "_rpmdir $(ABS_TOPDIR)"
# location of source RPM
RPM_SRPMDIR = --define "_srcrpmdir $(ABS_TOPDIR)"
+# required packages
+ifeq ($(NSOS_ARCH)$(NSOS_RELEASE), RHEL4)
+ RPM_REQUIRES = --define "_requireslist perl,xorg-x11-deprecated-libs"
+else
+ RPM_REQUIRES = --define "_requireslist perl"
+endif
ifneq ($(BUILD_DEBUG), optimize)
RPM_FLAVOR = dbg
else
@@ -795,7 +801,7 @@
rm $(RPM_FILE_BASE) ; \
fi
# execute the RPM build
- rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR)
--define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba
$(OBJDIR)/$(RPM_BASE_NAME)-ds.spec
+ rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR)
$(RPM_REQUIRES) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba
$(OBJDIR)/$(RPM_BASE_NAME)-ds.spec
ifdef BUILD_SHIP
cp
$(ABS_TOPDIR)/$(RPM_FILE_BASE)*$(NSOS_ARCH)$(NSOS_RELEASE).$(RPM_ARCH).$(RPM_FLAVOR).rpm
$(BUILD_SHIP)