diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2005-09-13 17:22:04 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2005-09-13 17:22:04 +0000 |
| commit | b45acc853d7c0aaec2c63e97ccec1397137fe66a (patch) | |
| tree | 3d9efeec5bf175ccfcdf5255291dfc1f29f7450e | |
| parent | 6e232b4580316c07c39d5e8079f5233c5e79e598 (diff) | |
| download | ds-b45acc853d7c0aaec2c63e97ccec1397137fe66a.tar.gz ds-b45acc853d7c0aaec2c63e97ccec1397137fe66a.tar.xz ds-b45acc853d7c0aaec2c63e97ccec1397137fe66a.zip | |
168222 - Added xorg-x11-deprecated-libs dependency for RHEL4
| -rw-r--r-- | ldap/cm/Makefile | 8 | ||||
| -rw-r--r-- | ldapserver.spec.tmpl | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index 550ae5ce..1fa4f8e7 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -285,6 +285,12 @@ ifdef BUILD_RPM 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 @@ ifdef BUILD_RPM 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) diff --git a/ldapserver.spec.tmpl b/ldapserver.spec.tmpl index 4586e92a..2fb69003 100644 --- a/ldapserver.spec.tmpl +++ b/ldapserver.spec.tmpl @@ -58,7 +58,7 @@ Autoreq: 0 # Don't automatically generate provides list AutoProv: 0 # Without Requires: something, rpmbuild will abort! -Requires: perl +Requires: %{_requireslist} Prefix: /opt/%{name} %description @@ -143,6 +143,9 @@ if [ "$1" = 0 ] ; then fi %changelog +* Tue Sep 13 2005 Nathan Kinder <nkinder@redhat.com> 7.1-3 +- use a macro for require list that is passed in via rpmbuild + * Tue May 10 2005 Richard Megginson <rmeggins@redhat.com> 7.1-2 - Change release to 2 |