Changeset 752 for trunk/server/packaging


Ignore:
Timestamp:
Nov 29, 2012, 2:06:31 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:
trunk/server
Files:
5 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk/server

  • trunk/server/packaging/RHEL-CTDB/samba.spec

    r745 r752  
    66Packager: Samba Team <samba@samba.org>
    77Name:         samba
    8 Version:      3.6.0
     8Version:      3.6.9
    99Release:      1GITHASH
    1010Epoch:        0

  • trunk/server/packaging/RHEL/makerpms.sh

    r745 r752  
    2121USERID=`id -u`
    2222GRPID=`id -g`
    23 VERSION='3.6.0'
     23VERSION='3.6.9'
    2424REVISION=''
    2525SPECFILE="samba.spec"

  • trunk/server/packaging/RHEL/samba.spec

    r745 r752  
    11%define initdir %{_sysconfdir}/rc.d/init.d
    22%define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
     3%define this_is_redhat  %(test -e /etc/redhat-release && echo 1 || echo 0)
     4%if %{this_is_redhat} > 0
     5%define rhel_ver %(grep "release" /etc/redhat-release | sed %"s/^[^0-9]*\\([0-9]*\\).*/\\1/g")
     6%else
     7%define rhel_ver 0
     8%endif
    39
    410Summary: Samba SMB client and server
    … …  
    612Packager: Samba Team <samba@samba.org>
    713Name:         samba
    8 Version:      3.6.0
     14Version:      3.6.9
    915Release:      1
    1016Epoch:        0
    … …  
    2935Prefix: /usr
    3036BuildRoot: %{_tmppath}/%{name}-%{version}-root
    31 BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, keyutils-devel
     37BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
     38
     39%if %{rhel_ver} > 4
     40BuildRequires:  keyutils-libs-devel
     41%else
     42BuildRequires:  keyutils-devel
     43%endif
    3244
    3345# Working around perl dependency problem from docs
    … …  
    234246install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
    235247install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
    236 install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
    237 install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
    238248install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
    239 
    240 /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
    241249
    242250ln -s ../..%{initdir}/smb  $RPM_BUILD_ROOT%{_sbindir}/samba
    … …  
    332340%{_bindir}/smbcontrol
    333341%{_bindir}/smbstatus
     342%{_bindir}/smbta-util
    334343%{_bindir}/tdbbackup
    335344%{_bindir}/tdbtool
    336345%{_bindir}/tdbdump
     346%{_bindir}/tdbrestore
    337347%{_bindir}/wbinfo
    338348%{_bindir}/ntlm_auth
    … …  
    393403%files client
    394404%defattr(-,root,root)
    395 /sbin/mount.cifs
    396 /sbin/umount.cifs
    397 %{_sbindir}/cifs.upcall
    398405
    399406%{_bindir}/rpcclient
    … …  
    411418%{_bindir}/smbtree
    412419
    413 %{_mandir}/man8/mount.cifs.8.*
    414 %{_mandir}/man8/umount.cifs.8.*
    415 %{_mandir}/man8/cifs.upcall.8.*
    416420%{_mandir}/man8/smbspool.8*
    417421%{_mandir}/man1/smbget.1*
    … …  
    442446%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
    443447%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
     448/usr/share/locale/de/LC_MESSAGES/net.mo
    444449/usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
    445450/usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo
    … …  
    484489%{_bindir}/profiles
    485490
    486 %{_bindir}/ldbadd
    487 %{_bindir}/ldbdel
    488 %{_bindir}/ldbedit
    489 %{_bindir}/ldbmodify
    490 %{_bindir}/ldbrename
    491 %{_bindir}/ldbsearch
    492 
    493491%{_mandir}/man1/profiles.1*
    494492%{_mandir}/man1/testparm.1*
    … …  
    496494%{_mandir}/man5/lmhosts.5*
    497495%{_mandir}/man8/smbpasswd.8*
     496%{_mandir}/man5/pam_winbind.conf.5.*
    498497%{_mandir}/man7/libsmbclient.7*
     498%{_mandir}/man8/smbta-util.8*
    499499%{_mandir}/man8/pam_winbind.8*
    500 
    501 %{_mandir}/man1/ldbadd.1*
    502 %{_mandir}/man1/ldbdel.1*
    503 %{_mandir}/man1/ldbedit.1*
    504 %{_mandir}/man1/ldbmodify.1*
    505 %{_mandir}/man1/ldbrename.1*
    506 %{_mandir}/man1/ldbsearch.1*
    507500
    508501%changelog

  • trunk/server/packaging/RHEL/samba.spec.tmpl

    r480 r752  
    11%define initdir %{_sysconfdir}/rc.d/init.d
    22%define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
     3%define this_is_redhat  %(test -e /etc/redhat-release && echo 1 || echo 0)
     4%if %{this_is_redhat} > 0
     5%define rhel_ver %(grep "release" /etc/redhat-release | sed %"s/^[^0-9]*\\([0-9]*\\).*/\\1/g")
     6%else
     7%define rhel_ver 0
     8%endif
    39
    410Summary: Samba SMB client and server
    … …  
    2935Prefix: /usr
    3036BuildRoot: %{_tmppath}/%{name}-%{version}-root
    31 BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, keyutils-devel
     37BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
     38
     39%if %{rhel_ver} > 4
     40BuildRequires:  keyutils-libs-devel
     41%else
     42BuildRequires:  keyutils-devel
     43%endif
    3244
    3345# Working around perl dependency problem from docs
    … …  
    234246install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
    235247install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
    236 install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
    237 install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
    238248install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
    239 
    240 /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
    241249
    242250ln -s ../..%{initdir}/smb  $RPM_BUILD_ROOT%{_sbindir}/samba
    … …  
    332340%{_bindir}/smbcontrol
    333341%{_bindir}/smbstatus
     342%{_bindir}/smbta-util
    334343%{_bindir}/tdbbackup
    335344%{_bindir}/tdbtool
    336345%{_bindir}/tdbdump
     346%{_bindir}/tdbrestore
    337347%{_bindir}/wbinfo
    338348%{_bindir}/ntlm_auth
    … …  
    393403%files client
    394404%defattr(-,root,root)
    395 /sbin/mount.cifs
    396 /sbin/umount.cifs
    397 %{_sbindir}/cifs.upcall
    398405
    399406%{_bindir}/rpcclient
    … …  
    411418%{_bindir}/smbtree
    412419
    413 %{_mandir}/man8/mount.cifs.8.*
    414 %{_mandir}/man8/umount.cifs.8.*
    415 %{_mandir}/man8/cifs.upcall.8.*
    416420%{_mandir}/man8/smbspool.8*
    417421%{_mandir}/man1/smbget.1*
    … …  
    442446%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
    443447%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
     448/usr/share/locale/de/LC_MESSAGES/net.mo
    444449/usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
    445450/usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo
    … …  
    484489%{_bindir}/profiles
    485490
    486 %{_bindir}/ldbadd
    487 %{_bindir}/ldbdel
    488 %{_bindir}/ldbedit
    489 %{_bindir}/ldbmodify
    490 %{_bindir}/ldbrename
    491 %{_bindir}/ldbsearch
    492 
    493491%{_mandir}/man1/profiles.1*
    494492%{_mandir}/man1/testparm.1*
    … …  
    496494%{_mandir}/man5/lmhosts.5*
    497495%{_mandir}/man8/smbpasswd.8*
     496%{_mandir}/man5/pam_winbind.conf.5.*
    498497%{_mandir}/man7/libsmbclient.7*
     498%{_mandir}/man8/smbta-util.8*
    499499%{_mandir}/man8/pam_winbind.8*
    500 
    501 %{_mandir}/man1/ldbadd.1*
    502 %{_mandir}/man1/ldbdel.1*
    503 %{_mandir}/man1/ldbedit.1*
    504 %{_mandir}/man1/ldbmodify.1*
    505 %{_mandir}/man1/ldbrename.1*
    506 %{_mandir}/man1/ldbsearch.1*
    507500
    508501%changelog
Note: See TracChangeset for help on using the changeset viewer.