[Fedora-directory-commits] ldapserver/ldap/cm/newinst slapd-patch.inf, NONE, 1.1.2.1 Makefile, 1.6.2.1, 1.6.2.2
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19966/ldap/cm/newinst
Modified Files:
Tag: Directory71RtmBranch
Makefile
Added Files:
Tag: Directory71RtmBranch
slapd-patch.inf
Log Message:
[167982] Service Pack framework
1) added patch info files and a perl script to process the info (RPM)
2) modified makefiles to create RPM based as well as setupsdk based SP package
--- NEW FILE slapd-patch.inf ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
[General]
Name= %%%SERVER_NAME%%%
Components=slapd-71sp1
[slapd-71sp1]
Name= %%%SERVER_NAME%%%
Description= %%%SERVER_NAME%%%
NickName= slapd-71sp1
Version= %%%SERVER_VERSION%%%
BuildNumber= %%%SERVER_BUILD_NUM%%%
Archive= nsslapd-71sp1.zip
SourcePath=slapd-71sp1
Checked=True
Mandatory=False
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- Makefile 31 Aug 2005 21:40:50 -0000 1.6.2.1
+++ Makefile 10 Sep 2005 00:41:48 -0000 1.6.2.2
@@ -181,6 +181,9 @@
else
$(INFO):
$(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"
+ifdef BUILD_PATCH
+ $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION)
$(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME)
$(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $(a)-patch.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
endif
$(OBJDEST)/%.o: %.c