r11170: root free pass on eventlog open access check

[ira/wip.git] / packaging / RedHat / samba.spec.tmpl

diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index d5124d05edbea97c39c4b28655a1b694b41fe440..004f57cf5227fb9a75412c4dc5f0663dd70ae6dd 100644 (file)
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -16,8 +16,8 @@ Source998: filter-requires-samba_rh8.sh
 Source999: filter-requires-samba_rh9.sh
 
 Packager: Gerald Carter [Samba-Team] <jerry@samba.org>
-Requires: pam openldap krb5-libs 
-BuildRequires: openldap-devel krb5-devel pam-devel
+Requires: pam openldap krb5-libs cups
+BuildRequires: openldap-devel krb5-devel pam-devel cups-devel
 Prereq: chkconfig fileutils /sbin/ldconfig
 Provides: samba = %{version}
 Obsoletes: samba-common, samba-client, samba-swat
@@ -90,6 +90,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
        --with-fhs \
        --with-quotas \
        --with-smbmount \
+       --enable-cups \
        --with-pam \
        --with-pam_smbpass \
        --with-syslog \
@@ -103,6 +104,7 @@ make -j${NUMCPU} all modules nsswitch/libnss_wins.so
 make -j${NUMCPU} debug2html
 
 # Remove some permission bits to avoid to many dependencies
+cd ..
 find examples docs -type f | xargs -r chmod -x
 
 %install
@@ -113,7 +115,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/samba
 mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba}
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include,using_samba}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{help,include,using_samba}
 mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs}
 mkdir -p $RPM_BUILD_ROOTMANDIR_MACRO
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba
@@ -124,9 +126,9 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/samba/vfs
 mkdir -p $RPM_BUILD_ROOT%{prefix}/{lib,include}
 
 # Install standard binary files
-for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
+for i in nmblookup smbclient smbpasswd smbstatus testparm \
        rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net \
-       smbcacls pdbedit tdbbackup smbtree ntlm_auth smbcquotas
+       smbcacls pdbedit eventlogadm tdbbackup smbtree ntlm_auth smbcquotas
 do
        install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
@@ -186,6 +188,11 @@ install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{prefix}/lib/
 install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{prefix}/lib/
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{prefix}/include/
 
+# libmsrpc
+install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{prefix}/lib/
+install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{prefix}/lib/
+install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{prefix}/include/
+
 # Install the miscellany
 install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
 install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
@@ -412,7 +419,6 @@ fi
 %{prefix}/bin/smbspool
 %{prefix}/bin/rpcclient
 %{prefix}/bin/testparm
-%{prefix}/bin/testprns
 %{prefix}/bin/findsmb
 %{prefix}/bin/smbstatus
 %{prefix}/bin/nmblookup
@@ -426,10 +432,12 @@ fi
 %{prefix}/bin/smbcquotas
 %{prefix}/bin/smbcacls
 %{prefix}/bin/pdbedit
+%{prefix}/bin/eventlogadm
 %{prefix}/bin/tdbbackup
 %{prefix}/bin/smbtree
 %attr(755,root,root) /lib/libnss_wins.s*
 %attr(755,root,root) %{prefix}/lib/samba/vfs/*.so
+%attr(755,root,root) %{prefix}/lib/samba/auth/*.so
 %attr(755,root,root) %{prefix}/lib/samba/charset/*.so
 %attr(755,root,root) %{prefix}/lib/samba/idmap/*.so
 #%attr(755,root,root) %{prefix}/lib/samba/pdb/*.so
@@ -438,11 +446,12 @@ fi
 %{prefix}/include/libsmbclient.h
 %{prefix}/lib/libsmbclient.a
 %{prefix}/lib/libsmbclient.so
+%{prefix}/include/libmsrpc.h
+%{prefix}/lib/libmsrpc.a
+%{prefix}/lib/libmsrpc.so
 %{prefix}/share/swat/help/*
-%{prefix}/share/swat/images/*
 %{prefix}/share/swat/include/*.html
 %{prefix}/share/swat/lang/*/help/*
-%{prefix}/share/swat/lang/*/images/*
 %{prefix}/share/swat/using_samba/*
 %config(noreplace) /etc/samba/lmhosts
 %config(noreplace) /etc/samba/smb.conf