[Fedora-directory-commits] dsbuild/ds/mod_nss .cvsignore, NONE, 1.1 Makefile, 1.6, 1.7 checksums, 1.6, 1.7

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsbuild/ds/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/mod_nss

Modified Files:
	Makefile checksums 
Added Files:
	.cvsignore 
Log Message:
updated for Fedora DS 1.1


--- NEW FILE .cvsignore ---
download
work
cookies


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	17 Oct 2006 17:31:11 -0000	1.6
+++ Makefile	8 Feb 2008 21:51:57 -0000	1.7
@@ -1,7 +1,7 @@
 include ../../objdirname.mk
 
 GARNAME = mod_nss
-GARVERSION = 1.0.5
+GARVERSION = 1.0.7
 CATEGORIES = ds
 PATCHFILES = 
 
@@ -15,15 +15,8 @@
 
 DESCRIPTION = mod_nss
 
-MOZILLA_DIST = $(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla/dist
-
-ifdef BUILD_MODULE_RPM
-  CONFIGURE_SCRIPTS = custom
-  BUILD_SCRIPTS = custom
-else
-  CONFIGURE_SCRIPTS = $(WORKSRC)/configure
-  BUILD_SCRIPTS = $(WORKSRC)/Makefile
-endif
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
 
 INSTALL_SCRIPTS = custom
 BUILD_ARGS = 
@@ -32,41 +25,23 @@
 post-extract: extract-cvs
 endif
 
-ifdef BUILD_MODULE_RPM
-  ifeq ($(DEBUG),full)
-    FLAVOR=dbg
-  else
-    FLAVOR=opt
-  endif
-
-  RPM_ARCH := $(shell uname -i)
-  RPM_TOP = $(ABS_GARDIR)/$(CATEGORIES)/mod_nss
-
-configure-custom:
-	$(MAKECOOKIE)
-
-build-custom:
-	$(MAKECOOKIE)
-
-else # BUILD_MODULE_RPM
-
-CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib
-
-ifeq ($(DEBUG),full)
-CONFIGURE_ENV = CFLAGS=-g
-else
-CONFIGURE_ENV = CFLAGS=-O2
+CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS)
+ifdef APR_CONFIG
+CONFIGURE_ARGS += --with-apr-config=$(APR_CONFIG)
+endif
+ifdef APXS
+CONFIGURE_ARGS += --with-apxs=$(APXS)
+CONFIGURE_ENV += CPPFLAGS="$(shell $(APXS) -q CPPFLAGS)"
+endif
+ifdef HTTPD
+CONFIGURE_ARGS += --with-httpd=$(HTTPD)
 endif
-
-endif # BUILD_MODULE_RPM
 
 install-custom:
-ifdef BUILD_MODULE_RPM
-	rm -rf BUILD SPECS
-	mkdir BUILD SPECS
-	rpmbuild --define "_topdir $(RPM_TOP)" --define "_sourcedir $(RPM_TOP)/download" --define "_rpmdir work" --define "_srcrpmdir work" --define "ARCH $(RPM_ARCH)" --define "flavor $(FLAVOR)" --define "platform $(NSOS_ARCH)" --define "nsprincdir $(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/include" --define "nsprlibdir $(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib" --define "nssincdir $(MOZILLA_DIST)/public/nss" --define "nsslibdir $(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib" --nodeps --clean -ta $(RPM_TOP)/download/$(DISTFILES)
-	rm -rf BUILD SPECS
-endif
+	mkdir -p $(DESTDIR)$(PREFIX)/lib/dirsrv/modules
+	$(INSTALL) -m 755 $(WORKSRC)/.libs/libmodnss.so $(DESTDIR)$(PREFIX)/lib/dirsrv/modules
+	mkdir -p $(DESTDIR)$(PREFIX)/sbin
+	$(INSTALL) -m 755 $(WORKSRC)/nss_pcache $(DESTDIR)$(PREFIX)/sbin
 	$(MAKECOOKIE)
 
 include ../../gar.conf.mk


Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/checksums,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- checksums	17 Oct 2006 17:31:11 -0000	1.6
+++ checksums	8 Feb 2008 21:51:57 -0000	1.7
@@ -1 +1 @@
-cf14258f47075c937c5a1ac93a96c521  download/mod_nss-1.0.5.tar.gz
+71107cbc702bf07c6c79843aa92a0e09  download/mod_nss-1.0.7.tar.gz