r5265: ensure that the Fedora RPMS build with cups support

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

diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl
index ae6f95c9005063d28c5bedf064386700e35d54ae..e381dd0bc3d00a2efc91cf94f384cf2486b234b4 100644 (file)
--- a/packaging/Fedora/samba.spec.tmpl
+++ b/packaging/Fedora/samba.spec.tmpl
@@ -32,7 +32,7 @@ Requires: logrotate >= 3.4 initscripts >= 5.54-1
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
 Prereq: fileutils sed /etc/init.d 
-BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel, openldap-devel, krb5-devel
+BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
 
 
 # Working around perl dependency problem from docs
@@ -120,7 +120,8 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
        --with-sambabook=%{_datadir}/swat/using_samba \
        --with-swatdir=%{_datadir}/swat \
        --with-libsmbclient \
-       --with-acl-support 
+       --with-acl-support \
+       --enable-cups=yes
 make showlayout
 make proto
 make %{?_smp_mflags} all nsswitch/libnss_wins.so debug2html 
@@ -146,7 +147,7 @@ cd ..
 
 # Install other stuff
 install -m644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m644 %{SOURCE8} $RPM_BUILD_ROOT/etc/samba/smbusers
+install -m644 %{SOURCE9} $RPM_BUILD_ROOT/etc/samba/smbusers
 install -m755 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}
 install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/samba
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/samba
@@ -183,9 +184,10 @@ install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_win
 # make install puts libsmbclient.so in the wrong place on x86_64
 rm -f $RPM_BUILD_ROOT/usr/lib || true
 mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
-install -m 644 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so
-install -m 644 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
+install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so
+install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.*
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
@@ -200,6 +202,7 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5*
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8*
 
 %clean
@@ -271,6 +274,7 @@ fi
 %{_bindir}/smbstatus
 # %{_bindir}/smbadduser
 %{_bindir}/tdbbackup
+%{_bindir}/tdbtool
 %config(noreplace) %{_sysconfdir}/sysconfig/samba
 %config(noreplace) %{_sysconfdir}/samba/smbusers
 %attr(755,root,root) %config %{initdir}/smb
@@ -284,6 +288,7 @@ fi
 %{_mandir}/man8/nmbd.8*
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/smbd.8*
+%{_mandir}/man8/pam_winbind.8*
 %{_mandir}/man8/tdbbackup.8*
 #%{_mandir}/ja/man1/smbstatus.1*
 #%{_mandir}/ja/man5/smbpasswd.5*