packages: samba/samba.spec - improve avahi bcond - add merged_build bcond

[mmazur]

Author: mmazur                       Date: Thu Dec 24 02:00:00 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- improve avahi bcond
- add merged_build bcond

---- Files affected:
packages/samba:
   samba.spec (1.471 -> 1.472) 

---- Diffs:

================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.471 packages/samba/samba.spec:1.472
--- packages/samba/samba.spec:1.471	Sun Nov 29 01:31:33 2009
+++ packages/samba/samba.spec	Thu Dec 24 02:59:54 2009
@@ -25,6 +25,8 @@
 %bcond_without	kerberos5	# without Kerberos V support
 %bcond_without	ldap		# without LDAP support
 %bcond_without	avahi
+%bcond_without	merged_build	# without samba3+samba4 merge
+								# http://wiki.samba.org/index.php/Franky
 %bcond_with	mks		# with vfs-mks (mksd dependency not distributale)
 %bcond_with	vscan
 
@@ -1015,10 +1017,10 @@
 	--with-utmp \
 	--with-fhs \
 	--without-included-popt \
-	--enable-merged-build \
+	--%{?with_merged_build:en}%{!?with_merged_build:dis}able-merged-build \
 	--enable-automatic-dependencies \
 	--enable-dso \
-	--enable-avahi \
+	--%{?with_avahi:en}%{!?with_avahi:dis}able-avahi \
 	--disable-dnssd \
 	--with%{!?with_ldap:out}-ldap \
 	--with%{!?with_kerberos5:out}-krb5
@@ -1113,10 +1115,14 @@
 rm -r $RPM_BUILD_ROOT%{_datadir}/swat/using_samba
 
 # tests
+%if %{with merged_build}
 rm -r $RPM_BUILD_ROOT%{_bindir}/{gentest4,locktest4,masktest4,nsstest4}
+%endif
 
 mv $RPM_BUILD_ROOT%{_bindir}/tdbtool $RPM_BUILD_ROOT%{_bindir}/tdbtool_samba
+%if %{with merged_build}
 mv $RPM_BUILD_ROOT%{_bindir}/tdbtool4 $RPM_BUILD_ROOT%{_bindir}/tdbtool4_samba
+%endif
 
 %if %{with ldap}
 install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
@@ -1199,12 +1205,14 @@
 %attr(755,root,root) %{_sbindir}/nmbd
 %attr(755,root,root) %{_sbindir}/smbd
 %attr(755,root,root) %{_sbindir}/mksmbpasswd.sh
+%if %{with merged_build}
 %attr(755,root,root) %{_bindir}/ad2oLschema4
 %attr(755,root,root) %{_bindir}/oLschema2ldif4
-%attr(755,root,root) %{_bindir}/ldb*
 %attr(755,root,root) %{_bindir}/reg*
 # "This utility disabled until rewritten"
 #%attr(755,root,root) %{_bindir}/setnttoken4
+%endif
+%attr(755,root,root) %{_bindir}/ldb*
 %attr(755,root,root) %{_bindir}/smbstatus
 %attr(755,root,root) %{_bindir}/smbpasswd
 %attr(755,root,root) %{_bindir}/smbcontrol
@@ -1271,7 +1279,9 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/winbindd
 %attr(755,root,root) %{_bindir}/wbinfo
+%if %{with merged_build}
 %attr(755,root,root) %{_bindir}/wbinfo4
+%endif
 %attr(755,root,root) /%{_lib}/security/pam_winbind*
 %attr(755,root,root) /%{_lib}/libnss_winbind*
 %attr(754,root,root) /etc/rc.d/init.d/winbind
@@ -1286,23 +1296,26 @@
 
 %files client
 %defattr(644,root,root,755)
+%if %{with merged_build}
+%attr(755,root,root) %{_bindir}/cifsdd4
+%attr(755,root,root) %{_bindir}/net4
+%attr(755,root,root) %{_bindir}/nmblookup4
+%attr(755,root,root) %{_bindir}/smbclient4
+%attr(755,root,root) %{_sbindir}/cifs.upcall
+%{_mandir}/man8/cifs.upcall.8*
+%endif
 %attr(755,root,root) /sbin/mount.cifs
 %attr(755,root,root) /sbin/umount.cifs
-%attr(755,root,root) %{_bindir}/cifsdd4
 %attr(755,root,root) %{_bindir}/findsmb
 %attr(755,root,root) %{_bindir}/net
-%attr(755,root,root) %{_bindir}/net4
 %attr(755,root,root) %{_bindir}/nmblookup
-%attr(755,root,root) %{_bindir}/nmblookup4
 %attr(755,root,root) %{_bindir}/rpcclient
 %attr(755,root,root) %{_bindir}/sharesec
 %attr(755,root,root) %{_bindir}/smbcacls
 %attr(755,root,root) %{_bindir}/smbclient
-%attr(755,root,root) %{_bindir}/smbclient4
 %attr(755,root,root) %{_bindir}/smbsh
 %attr(755,root,root) %{_bindir}/smbtar
 %attr(755,root,root) %{_bindir}/smbtree
-%attr(755,root,root) %{_sbindir}/cifs.upcall
 %attr(755,root,root) %{_libdir}/smbwrapper.so
 %{_mandir}/man1/findsmb.1*
 %{_mandir}/man1/nmblookup.1*
@@ -1313,12 +1326,17 @@
 %{_mandir}/man1/smbsh.1*
 %{_mandir}/man1/smbtar.1*
 %{_mandir}/man1/smbtree.1*
-%{_mandir}/man8/cifs.upcall.8*
 %{_mandir}/man8/net.8*
 %{_mandir}/man8/*mount.cifs.8*
 
 %files common
 %defattr(644,root,root,755)
+%if %{with merged_build}
+%attr(755,root,root) %{_bindir}/getntacl4
+%attr(755,root,root) %{_bindir}/ndrdump4
+%attr(755,root,root) %{_bindir}/ntlm_auth4
+%attr(755,root,root) %{_bindir}/testparm4
+%endif
 %doc README Manifest WHATSNEW.txt
 %doc Roadmap docs/registry/*
 %doc docs/{history,THANKS}
@@ -1326,15 +1344,11 @@
 %attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smb.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/lmhosts
 %attr(755,root,root) %{_bindir}/eventlogadm
-%attr(755,root,root) %{_bindir}/getntacl4
-%attr(755,root,root) %{_bindir}/ndrdump4
 %attr(755,root,root) %{_bindir}/ntlm_auth
-%attr(755,root,root) %{_bindir}/ntlm_auth4
 %attr(755,root,root) %{_bindir}/pdbedit
 %attr(755,root,root) %{_bindir}/profiles
 %attr(755,root,root) %{_bindir}/smbcquotas
 %attr(755,root,root) %{_bindir}/testparm
-%attr(755,root,root) %{_bindir}/testparm4
 %attr(755,root,root) %{_bindir}/vfstest
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.dat
@@ -1604,6 +1618,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.472  2009/12/24 01:59:54  mmazur
+- improve avahi bcond
+- add merged_build bcond
+
 Revision 1.471  2009/11/29 00:31:33  sparky
 - BR: gettext-devel, pkgconfig, tdb-devel
 - some adapterization
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.471&r2=1.472&f=u