diff -pr samba-3.5.5/packaging/RHEL/samba.spec samba-3.5.5-new/packaging/RHEL/samba.spec
*** samba-3.5.5/packaging/RHEL/samba.spec	2010-09-09 17:22:04.000000000 +0000
--- samba-3.5.5-new/packaging/RHEL/samba.spec	2010-09-29 02:55:05.000000000 +0000
***************
*** 1,6 ****
--- 1,9 ----
  %define initdir %{_sysconfdir}/rc.d/init.d
  %define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
  
+ #a total hack - I don't know rpm better :-(
+ %define rhV %(awk '{print $3}' /etc/redhat-release|grep -c ^4)
+ 
  Summary: Samba SMB client and server
  Vendor: Samba Team
  Packager: Samba Team <samba@samba.org>
*************** Provides: samba = %{version}
*** 28,34 ****
  
  Prefix: /usr
  BuildRoot: %{_tmppath}/%{name}-%{version}-root
! BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, keyutils-devel
  
  # Working around perl dependency problem from docs
  %define __perl_requires %{SOURCE998}
--- 31,43 ----
  
  Prefix: /usr
  BuildRoot: %{_tmppath}/%{name}-%{version}-root
! BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
! 
! %if 0%{?rhV}
! BuildRequires: keyutils-devel
! %else
! BuildRequires: keyutils-libs-devel
! %endif
  
  # Working around perl dependency problem from docs
  %define __perl_requires %{SOURCE998}
*************** install -m755 setup/smbprint $RPM_BUILD_
*** 234,240 ****
  install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
  install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
  install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
- install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
  install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
  
  /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
--- 243,248 ----
*************** fi
*** 393,399 ****
  %files client
  %defattr(-,root,root)
  /sbin/mount.cifs
- /sbin/umount.cifs
  %{_sbindir}/cifs.upcall
  
  %{_bindir}/rpcclient
--- 401,406 ----
*************** fi
*** 442,447 ****
--- 449,455 ----
  %attr(755,root,root) /%{_libarch}/security/pam_winbind.so
  %attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
  /usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
+ /usr/share/locale/de/LC_MESSAGES/net.mo
  /usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo
  /usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo
  /usr/share/locale/da/LC_MESSAGES/pam_winbind.mo
*************** fi
*** 471,476 ****
--- 479,485 ----
  %{_libarchdir}/samba/charset/*.so
  
  %{_includedir}/netapi.h
+ %{_includedir}/wbc_async.h
  %{_includedir}/wbclient.h
  %{_includedir}/talloc.h
  %{_includedir}/tdb.h
*************** fi
*** 493,498 ****
--- 502,508 ----
  %{_mandir}/man1/profiles.1*
  %{_mandir}/man1/testparm.1*
  %{_mandir}/man5/smb.conf.5*
+ %{_mandir}/man5/pam_winbind.conf.5*
  %{_mandir}/man5/lmhosts.5*
  %{_mandir}/man8/smbpasswd.8*
  %{_mandir}/man7/libsmbclient.7*