SPECS: samba.spec - builds (vscan broken); files need fix

Sun Aug 31 23:35:16 CEST 2008

Author: arekm                        Date: Sun Aug 31 21:35:16 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds (vscan broken); files need fix

---- Files affected:
SPECS:
   samba.spec (1.410 -> 1.411) 

---- Diffs:

================================================================
Index: SPECS/samba.spec
diff -u SPECS/samba.spec:1.410 SPECS/samba.spec:1.411

--- SPECS/samba.spec:1.410	Mon Aug 18 11:47:18 2008
+++ SPECS/samba.spec	Sun Aug 31 23:35:10 2008
@@ -17,6 +17,7 @@
 %bcond_without	kerberos5	# without Kerberos V support
 %bcond_without	ldap		# without LDAP support
 %bcond_with	mks		# with vfs-mks (mksd dependency not distributale)
+%bcond_with	vscan
 
 # ADS requires kerberos5 and LDAP
 %if !%{with kerberos5} || !%{with ldap}
@@ -40,13 +41,13 @@
 Summary(uk.UTF-8):	SMB клієнт та сервер
 Summary(zh_CN.UTF-8):	Samba 客户端和服务器
 Name:		samba
-Version:	3.2.1
+Version:	3.2.3
 Release:	0.1
 Epoch:		1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://www.samba.org/samba/ftp/%{name}-%{version}.tar.gz
-# Source0-md5:	ed2b790b035e508177aa2d1547af383d
+# Source0-md5:	c1630a57ac0ec24bc364c6d11c93ec35
 Source1:	smb.init
 Source2:	%{name}.pamd
 Source3:	swat.inetd
@@ -104,6 +105,7 @@
 
 %define		_vfsdir		%{_libdir}/%{name}/vfs
 %define		_sambahome	/home/services/samba
+%define		_sambalibdir	%{_libdir}/%{name}
 %if %{with cups}
 %define		cups_serverbin	%{_prefix}/lib/cups
 %endif
@@ -957,6 +959,7 @@
 %{__libtoolize}
 %{__autoconf} -Im4 -Ilib/replace
 %configure \
+	--libdir=%{_sambalibdir} \
 	--with-rootsbindir=/sbin \
 	--with-pammodulesdir=/%{_lib}/security \
 	--with-acl-support \
@@ -985,15 +988,19 @@
 	CFLAGS="%{rpmcflags} -fPIC \$(DEFS) \\\$(SMBINCLUDE)"
 
 cd VFS
+%{__autoheader}
 %{__autoconf}
 %configure \
 	CFLAGS="%{rpmcflags} -fPIC"
 %{__make}
 
+%if %{with vscan}
 cd samba-vscan-%{vscan_version}
 cp -f /usr/share/automake/config.sub .
 %configure
+ln -s ../../../source/lib .
 %{__make} all
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1027,29 +1034,25 @@
 install source/bin/smbget		$RPM_BUILD_ROOT%{_bindir}
 install source/bin/vfstest		$RPM_BUILD_ROOT%{_bindir}
 
-mv $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
-ln -s libsmbclient.so.0 $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so
+mv $RPM_BUILD_ROOT%{_libdir}/samba/lib*.so* $RPM_BUILD_ROOT%{_libdir}
 install source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
-mv $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
-ln -s libmsrpc.so.0 $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
-install source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
-
-install source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 
 # smbwrapper
 install examples/libsmbclient/smbwrapper/smbwrapper.so $RPM_BUILD_ROOT%{_libdir}/smbwrapper.so
 install examples/libsmbclient/smbwrapper/smbsh $RPM_BUILD_ROOT%{_bindir}
-install docs/manpages/smbsh.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install examples/libsmbclient/smbwrapper/smbsh.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 # these are needed to build samba-pdbsql
 install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/{tdb,nsswitch}
 cp -a source/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
-cp -a source/tdb/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/tdb
+cp -a source/lib/tdb/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/tdb
 cp -a source/nsswitch/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/nsswitch
 
+%if %{with vscan}
 # vscan modules
 install examples/VFS/samba-vscan-%{vscan_version}/*.so $RPM_BUILD_ROOT%{_vfsdir}
 install examples/VFS/samba-vscan-%{vscan_version}/{antivir,clamav,fprot,icap,kaspersky,mks,openantivirus,sophos,trend,f-secure,nai}/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba
+%endif
 
 touch $RPM_BUILD_ROOT/var/lib/samba/{wins.dat,browse.dat}
 
@@ -1135,6 +1138,7 @@
 %attr(755,root,root) %{_sbindir}/nmbd
 %attr(755,root,root) %{_sbindir}/smbd
 %attr(755,root,root) %{_sbindir}/mksmbpasswd.sh
+%attr(755,root,root) %{_bindir}/ldb*
 %attr(755,root,root) %{_bindir}/smbstatus
 %attr(755,root,root) %{_bindir}/smbpasswd
 %attr(755,root,root) %{_bindir}/smbcontrol
@@ -1150,6 +1154,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/samba
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/samba
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.samba
+%{_mandir}/man1/ldb*.1*
 %{_mandir}/man1/log2pcap.1*
 %{_mandir}/man1/smbstatus.1*
 %{_mandir}/man1/smbcontrol.1*
@@ -1197,17 +1202,11 @@
 %attr(755,root,root) /sbin/mount.cifs
 %attr(755,root,root) /sbin/umount.cifs
 %attr(755,root,root) %{_bindir}/net
-%attr(755,root,root) %{_bindir}/smbmnt
-%attr(755,root,root) %{_bindir}/smbmount
 %attr(755,root,root) %{_bindir}/smbsh
 %attr(755,root,root) %{_bindir}/smbtree
-%attr(755,root,root) %{_bindir}/smbumount
 %attr(755,root,root) %{_libdir}/smbwrapper.so
 %{_mandir}/man1/smbtree.1*
 %{_mandir}/man8/net.8*
-%{_mandir}/man8/smbmnt.8*
-%{_mandir}/man8/smbmount.8*
-%{_mandir}/man8/smbumount.8*
 %{_mandir}/man8/*mount.cifs.8*
 %attr(755,root,root) %{_bindir}/nmblookup
 %attr(755,root,root) %{_bindir}/smbcacls
@@ -1294,16 +1293,16 @@
 
 %files -n libsmbclient
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmsrpc.so.*
 %attr(755,root,root) %{_libdir}/libsmbclient.so.*
+%attr(755,root,root) %{_libdir}/libwbclient.so.*
 %{_mandir}/man7/libsmbclient.7*
 
 %files -n libsmbclient-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmsrpc.so
 %attr(755,root,root) %{_libdir}/libsmbclient.so
-%{_includedir}/libmsrpc.h
+%attr(755,root,root) %{_libdir}/libwbclient.so
 %{_includedir}/libsmbclient.h
+%{_includedir}/wbclient.h
 
 %files devel
 %defattr(644,root,root,755)
@@ -1311,7 +1310,6 @@
 
 %files -n libsmbclient-static
 %defattr(644,root,root,755)
-%{_libdir}/libmsrpc.a
 %{_libdir}/libsmbclient.a
 
 %files -n smbget
@@ -1386,6 +1384,7 @@
 %attr(755,root,root) %{_vfsdir}/shadow_copy.so
 %{_mandir}/man8/vfs_shadow_copy.8*
 
+%if %{with vscan}
 %files vfs-vscan-antivir
 %defattr(644,root,root,755)
 #%doc examples/VFS/%{name}-vscan-%{vscan_version}/{INSTALL,FAQ}
@@ -1455,6 +1454,7 @@
 #%doc examples/VFS/%{name}-vscan-%{vscan_version}/{INSTALL,FAQ}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/vscan-trend.conf
 %attr(755,root,root) %{_vfsdir}/vscan-trend.so
+%endif
 
 %if %{with ldap}
 %files -n openldap-schema-samba
@@ -1476,6 +1476,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.411  2008/08/31 21:35:10  arekm
+- builds (vscan broken); files need fix
+
 Revision 1.410  2008/08/18 09:47:18  glen
 - mention that python-samba no longer exists in previous changelog entry
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/samba.spec?r1=1.410&r2=1.411&f=u

