r12593: packaging fixes missed from the 3.0.21 build

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

diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl
index a5da445053f2f4f4fc1128d38edb883d68d7a2e8..4f4299470b1edec695bc0a8362cb69f972fa6698 100644 (file)
--- a/packaging/Fedora/samba.spec.tmpl
+++ b/packaging/Fedora/samba.spec.tmpl
@@ -196,6 +196,14 @@ install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.*
 
+# make install puts libmsrpc.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 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
+install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
+install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
 
@@ -205,12 +213,9 @@ install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 ##
 ## Clean out man pages for tools not installed here
 ##
-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}/man1/testprns.1*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/vfstest.1*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -294,9 +299,9 @@ fi
 %{_mandir}/man8/nmbd.8*
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/smbd.8*
-%{_mandir}/man8/pam_winbind.8*
+%{_mandir}/man7/pam_winbind.7*
 %{_mandir}/man8/tdbbackup.8*
-%{_mandir}/man8/libsmbclient.8*
+%{_mandir}/man7/libsmbclient.7*
 
 %{_libdir}/samba/vfs
 
@@ -335,12 +340,15 @@ fi
 %{_mandir}/man8/umount.cifs.8.*
 %{_mandir}/man8/smbspool.8*
 %{_bindir}/nmblookup
+%{_bindir}/smbget
 %{_bindir}/smbclient
 %{_bindir}/smbprint
 %{_bindir}/smbspool
 %{_bindir}/smbtar
 %{_bindir}/net
 %{_bindir}/smbtree
+%{_mandir}/man1/smbget.1*
+%{_mandir}/man5/smbgetrc.5*
 %{_mandir}/man1/findsmb.1*
 %{_mandir}/man1/nmblookup.1*
 %{_mandir}/man1/rpcclient.1*
@@ -358,21 +366,23 @@ fi
 /%{_lib}/libnss_wins.so*
 /%{_lib}/libnss_winbind.so*
 /%{_lib}/security/pam_winbind.so
+%{_includedir}/libsmbclient.h
 %{_libdir}/libsmbclient.a
 %{_libdir}/libsmbclient.so
+%{_includedir}/libmsrpc.h
+%{_libdir}/libmsrpc.a
+%{_libdir}/libmsrpc.so
 %{_libdir}/samba/charset/CP*.so
 %{_libdir}/samba/idmap/idmap*.so
-%{_includedir}/libsmbclient.h
+%{_libdir}/samba/auth/script.so
 %{_bindir}/testparm
 %{_bindir}/smbpasswd
-# %{_bindir}/make_printerdef
 %{_bindir}/wbinfo
-# %{_bindir}/editreg
 %{_bindir}/ntlm_auth
 %{_bindir}/pdbedit
+%{_bindir}/eventlogadm
 %{_bindir}/profiles
 %{_bindir}/smbcquotas
-#%{_bindir}/vfstest
 %{_sbindir}/winbindd
 %config(noreplace) %{_sysconfdir}/samba/smb.conf
 %config(noreplace) %{_sysconfdir}/samba/lmhosts
@@ -391,7 +401,6 @@ fi
 %{_mandir}/man8/smbpasswd.8*
 %{_mandir}/man1/wbinfo.1*
 %{_mandir}/man8/winbindd.8*
-%{_mandir}/man1/vfstest.1*
 
 %changelog
 * Fri Jan 16 2004 Gerald (Jerry) Carter <jerry@samba,org>