rpm/samba
SHA256
1
0
Fork 0
forked from pool/samba
Code Pull Requests Activity

- No longer force activation of the cifs service on post-11.3 systems.

Browse Source 
- Add X-UnitedLinux-Default-Enabled to the cifs init script on pre-11.4
  systems.
- Move the cifs init script nfs dependencies from Required to Should.
- Fix error paths in cups_async_callback(), an empty cups printer list should
  not be treated as an error; (bnc#661842).
- Abide by printcap cache time, reload parent smbd pcap cache on expiry;
  (bso#7836); (bnc#625936).
- Fix race in cups async printer services reload; (bso#7836); (bnc#625936).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=150
This commit is contained in:
Lars Müller
2011-01-14 18:26:07 +00:00
committed by Git OBS Bridge
parent eb193532a5
commit 854dd23c47
6 changed files with 62 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
samba.spec
View File

@@ -1,5 +1,5 @@
#
# spec file for package samba (Version 3.5.6)
# spec file for package samba
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -173,7 +173,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package client
@@ -219,7 +219,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -246,7 +246,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%endif
@@ -276,7 +276,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%endif
@@ -303,7 +303,7 @@ Authors:
--------
Jeremy Allison <jra at samba dot org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%if %{make_utils}
@@ -353,7 +353,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -379,7 +379,7 @@ PreReq: /sbin/ldconfig
%description -n libsmbclient
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%else
@@ -424,7 +424,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libnetapi0
@@ -443,7 +443,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libnetapi-devel
@@ -463,7 +463,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -484,7 +484,7 @@ PreReq: /sbin/ldconfig
%description -n libsmbsharemodes
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%else
@@ -520,7 +520,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libtalloc2
@@ -539,7 +539,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libtalloc-devel
@@ -559,7 +559,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libtdb1
@@ -578,7 +578,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libtdb-devel
@@ -598,7 +598,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libwbclient0
@@ -617,7 +617,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libwbclient-devel
@@ -637,7 +637,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libtevent0
@@ -656,7 +656,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libtevent-devel
@@ -677,7 +677,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libldb0
@@ -697,7 +697,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%package -n libldb-devel
@@ -717,7 +717,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%if %{make_ldapsmb}
@@ -741,7 +741,7 @@ Authors:
--------
Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%endif
@@ -764,7 +764,7 @@ Authors:
--------
Steve French <sfrench at Samba dot org>
Source Timestamp: 2481
Source Timestamp: 2485
Branch : 3.5.6
%endif
@@ -1104,6 +1104,8 @@ if test 0%{?suse_version} -lt 901; then
scriptSuffix="-900"
elif test 0%{?suse_version} -lt 1011; then
scriptSuffix="-1010"
elif test 0%{?suse_version} -lt 1131; then
scriptSuffix="-1130"
fi
%endif
startScripts="smb nmb winbind %{cifs_init_script}"
@@ -1345,7 +1347,9 @@ fi
/sbin/ldconfig
if [ ${1:-0} -eq 1 ]; then
# Only insserv cifs if we're not in update mode.
%{?fillup_and_insserv:%{fillup_and_insserv -fy %cifs_init_script}}
%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131
%{?insserv_force_if_yast:%{insserv_force_if_yast cifs}}
%endif
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script}