SPECS: fedora-adminserver.spec - more

[qboosh]

Author: qboosh                       Date: Thu Nov 16 13:06:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more

---- Files affected:
SPECS:
   fedora-adminserver.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/fedora-adminserver.spec
diff -u SPECS/fedora-adminserver.spec:1.4 SPECS/fedora-adminserver.spec:1.5
--- SPECS/fedora-adminserver.spec:1.4	Thu Nov 16 09:55:43 2006
+++ SPECS/fedora-adminserver.spec	Thu Nov 16 14:06:11 2006
@@ -18,16 +18,17 @@
 BuildRequires:	libicu-devel >= 3.4
 BuildRequires:	libicu-devel < 3.5
 BuildRequires:	libstdc++-devel
-#BuildRequires:	libtermcap-devel
-BuildRequires:	mod_admserv >= 1.0
 BuildRequires:	mozldap-devel >= 6.0
+BuildRequires:	ncurses-devel
 BuildRequires:	net-snmp-devel >= 5.2.1
 BuildRequires:	nspr-devel >= 4.4.1
 BuildRequires:	nss-devel >= 3
 BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	sed >= 4.0
 #BuildRequires:	which
 #BuildRequires:	zip
 #Requires:	libicu >= 2.4
+#Requires:	mod_admserv >= 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,14 +62,26 @@
 %prep
 %setup -q
 
+# don't BR ldapsdk
+sed -i -e 's/build: ldapjdk nmcjdk/build:/' admserv/console/Makefile
+
 %build
 %{__make} \
+	ARCH_DEBUG="%{rpmcflags}" \
+	ARCH_OPT="%{rpmcflags}" \
+	BUILD_DEBUG=%{?debug:full}%{!?debug:optimize} \
 	CC="%{__cc}" \
+	CCC="%{__cxx}" \
 	CXX="%{__cxx}" \
 	MAKE="%{__make}" \
+	CURSES="-lncurses" \
 	NSOS_TEST=PLD \
+	MOD_ADMSERV= \
+	MOD_NSS= \
+	MOD_RESTARTD= \
 	ADMINUTIL_INCLUDE=/usr/include/adminutil-1.0 \
 	ADMINUTIL_LIBPATH=%{_libdir} \
+	ICU_BINPATH=/usr/bin \
 	ICU_INCLUDE=/usr/include \
 	ICU_LIBPATH=%{_libdir} \
 	LDAPOBJNAME='libldap$(LDAP_LIB_VERSION)$(LDAP_DLL_PRESUF).$(LDAP_DLL_SUFFIX)' \
@@ -96,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/16 13:06:11  qboosh
+- more
+
 Revision 1.4  2006/11/16 08:55:43  qboosh
 - up to 1.0.3
 - some build options and BRs; NFY
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fedora-adminserver.spec?r1=1.4&r2=1.5&f=u