SPECS: fedora-ds.spec - options for make; removed trash patches

[zbyniu]

Author: zbyniu                       Date: Sun Apr 30 03:17:07 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- options for make; removed trash patches

---- Files affected:
SPECS:
   fedora-ds.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/fedora-ds.spec
diff -u SPECS/fedora-ds.spec:1.12 SPECS/fedora-ds.spec:1.13
--- SPECS/fedora-ds.spec:1.12	Sat Apr 29 18:17:51 2006
+++ SPECS/fedora-ds.spec	Sun Apr 30 05:17:01 2006
@@ -11,9 +11,6 @@
 Group:		Applications
 Source0:	http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
 # Source0-md5:	d8bd5b68087229b4bb2e3867cb92ba85
-Patch0:		%{name}-make.patch
-Patch1:		%{name}-included.patch
-Patch2:		http://directory.fedora.redhat.com/sources/ldapserver-gcc4.patch
 URL:		http://directory.fedora.redhat.com/
 BuildRequires:	apr-devel
 BuildRequires:	db-devel >= 4.0
@@ -89,19 +86,22 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-#%patch2 -p1
 
 %build
 #%%configure
 %{__make} \
+	MAKE=make \
 	NSPR_INCDIR=/usr/include/nspr \
-	SECURITY_INCDIR=/usr/include/openssl \
-	DBM_INCLUDE=/usr/include \
-	LDAP_INCLUDE=/usr/include/nss \
-	SASL_INCLUDE=/usr/include/sasl \
-	SVRCORE_INCLUDE=/usr/include \
+	SECURITY_INCDIR=/usr/include/nss \
+	DBM_LIBNAMES=gdbm \
+	DB_INCLUDE=/usr/include \
+	GSSAPI_LIBS=-lgssapi \
+	ICU_INCDIR=/usr/include/unicode \
+	LDAPSDK_INCDIR=/usr/include/mozldap \
+	NETSNMP_INCDIR=/usr/include/net-snmp \
+	NETSNMP_LIBNAMES="netsnmp netsnmpagent netsnmpmibs netsnmphelpers rpm sensors" \
+	SASL_INCDIR=/usr/include/sasl \
+	SVRCORE_INCLUDE=-I$PWD/../mozilla/security/svrcore \
 	MFLAGS="\
 		USE_ADMINSERVER=1 \
 		USE_CONSOLE=1 \
@@ -145,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/04/30 03:17:01  zbyniu
+- options for make; removed trash patches
+
 Revision 1.12  2006/04/29 16:17:51  wolvverine
 - BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fedora-ds.spec?r1=1.12&r2=1.13&f=u