SPECS: fedora-ds.spec - up to 1.0.4 - at least build is passed now

[qboosh]

Author: qboosh                       Date: Fri Nov 17 14:05:50 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.0.4
- at least build is passed now

---- Files affected:
SPECS:
   fedora-ds.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/fedora-ds.spec
diff -u SPECS/fedora-ds.spec:1.16 SPECS/fedora-ds.spec:1.17
--- SPECS/fedora-ds.spec:1.16	Tue May  9 11:40:00 2006
+++ SPECS/fedora-ds.spec	Fri Nov 17 15:05:45 2006
@@ -5,36 +5,33 @@
 Summary:	Fedora Directory Server
 Summary(pl):	Fedora Directory Server - serwer usług katalogowych
 Name:		fedora-ds
-Version:	1.0.2
+Version:	1.0.4
 Release:	0.1
 License:	GPL v2
 Group:		Applications
 Source0:	http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
-# Source0-md5:	d8bd5b68087229b4bb2e3867cb92ba85
+# Source0-md5:	fca8c94d2bfdc3a762c0e8b09ab04b09
 URL:		http://directory.fedora.redhat.com/
-#BuildRequires:	apr-devel
-BuildRequires:	cyrus-sasl-devel
+BuildRequires:	cyrus-sasl-devel >= 2.0
 BuildRequires:	db-devel >= 4.0
 # fake, but required now
-BuildRequires:	db-utils
-BuildRequires:	fedora-adminutil
-BuildRequires:	fedora-setuputil
+#BuildRequires:	db-utils
+BuildRequires:	fedora-adminutil >= 1.0
+BuildRequires:	fedora-setuputil >= 1.0
 BuildRequires:	gdbm-devel >= 1.6
 #BuildRequires:	java-sun
 #BuildRequires:	libgssapi-devel
-BuildRequires:	libicu-devel
+BuildRequires:	libicu-devel >= 2.4
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtermcap-devel
 BuildRequires:	lm_sensors-devel
 BuildRequires:	mozldap-devel >= 5.16
 BuildRequires:	ncurses-devel
 BuildRequires:	net-snmp-devel >= 5.2.1
-BuildRequires:	nspr-devel >= 4.4.1
-BuildRequires:	nss-devel >= 3.9.3
+BuildRequires:	nspr-devel >= 1:4.4.1
+BuildRequires:	nss-devel >= 1:3.9.3
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	which
 BuildRequires:	zip
-#or BuildRequires:	ibm-java-sdk
 #
 #BuildRequires:	Java/XML Components
 # axis.jar, jaxrpc.jar, and saaj.jar - http://ws.apache.org/axis/index.html
@@ -47,7 +44,6 @@
 #BuildRequires:	krb5-devel
 #BuildRequires:	mozilla-components: DBM (v1.61), NSS (v3.93), SVRCORE (v4.0), LDAPSDK (v5.16), and PerLDAP (*)
 #BuildRequires:	perl-Mozilla-LDAP
-Requires:	libicu >= 2.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -100,14 +96,19 @@
 touch __admserv/setup.inf
 
 %build
-%{__make} \
+%{__make} buildDirectory \
+	ARCH_DEBUG="%{rpmcflags}" \
+	ARCH_OPT="%{rpmcflags}" \
+	BUILD_DEBUG=%{?debug:full}%{!?debug:optimize} \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	MAKE=%{__make} \
-	ADMINUTIL_INCPATH=%{_includedir}/libadminutil \
-	ADMINUTIL_LINK=-ladminutil10 \
+	NSOS_TEST=PLD \
+	ADMINUTIL_INCPATH=%{_includedir}/adminutil-1.0 \
+	ADMINUTIL_LINK=-ladminutil \
 	ADMINSERVER_SUBCOMPS=setup.inf \
 	ADMSERV_DIR=$PWD/__admserv \
+	CURSES="-lncurses" \
 	DB_BINPATH=%{_bindir} \
 	DB_INCLUDE=%{_includedir} \
 	DBM_INCDIR=%{_includedir} \
@@ -121,9 +122,9 @@
 	NSPR_INCDIR=%{_includedir}/nspr \
 	SASL_INCDIR=%{_includedir}/sasl \
 	SECURITY_INCDIR=%{_includedir}/nss \
-	SETUPUTIL_INCDIR=%{_includedir} \
+	SETUPUTIL_INCDIR=/usr/include/fedora-setuputil \
 	SETUPUTIL_BINPATH=%{_bindir} \
-	SVRCORE_INCLUDE=-I$PWD/../mozilla/security/svrcore \
+	SVRCORE_INCLUDE="-I/usr/include/svrcore" \
 	MFLAGS="\
 		USE_ADMINSERVER=1 \
 		USE_CONSOLE=0 \
@@ -133,7 +134,7 @@
 		USE_JAVATOOLS=0 \
 		USE_SETUPUTIL=1 \
 		USE_PERL_FROM_PATH=1 \
-		DEBUG=full \
+		DEBUG=%{?debug:full}%{!?debug:optimize} \
 		NOJAVA=1"
 
 %install
@@ -142,8 +143,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
-%defattr(644,root,root,755)
+#%files
+#%defattr(644,root,root,755)
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -151,6 +152,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/11/17 14:05:45  qboosh
+- up to 1.0.4
+- at least build is passed now
+
 Revision 1.16  2006/05/09 09:40:00  qboosh
 - sorted BRs
 
================================================================

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