Accepting request 38752 from network:samba:STABLE
Copy from network:samba:STABLE/samba based on submit request 38752 from user lmuelle OBS-URL: https://build.opensuse.org/request/show/38752 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=65
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
16d00db3da
commit
2fba4a38a8
@ -1,2 +1,2 @@
|
||||
2345
|
||||
2355
|
||||
Branch : trunk
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c5ea703e277d5a2dc84cf711f30428d51ba479a886760dd63571179c84a0fce3
|
||||
size 72288
|
||||
oid sha256:505d7240d655a83495577c45f1c72f94cada1089b54b7991898522ac6e1657a9
|
||||
size 72500
|
||||
|
||||
@ -63,7 +63,7 @@ BuildRequires: pkgconfig
|
||||
%endif
|
||||
Url: http://www.samba.org/
|
||||
Version: 3.5.2
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: GPLv3+
|
||||
Summary: Samba Documentation
|
||||
Group: Documentation/Other
|
||||
@ -130,6 +130,11 @@ BuildRequires: ccache
|
||||
%define VENDOR %_vendor
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
|
||||
%define cups_lib_dir %{_prefix}/lib/cups
|
||||
%else
|
||||
%define cups_lib_dir %{_libdir}/cups
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%prep
|
||||
@ -279,27 +284,6 @@ scripts="creategroup mksmbpasswd.sh"
|
||||
for i in $scripts; do
|
||||
%__install -m 0755 "source3/script/${i}" examples/scripts/${i}
|
||||
done
|
||||
# libtevent
|
||||
%{__make} -C lib/tevent/ install \
|
||||
DESTDIR=${RPM_BUILD_ROOT} \
|
||||
CONFIGDIR=%{CONFIGDIR}
|
||||
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/tevent.pc
|
||||
%if %{link_static_libs} == 0
|
||||
rm ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.a
|
||||
%endif
|
||||
# libldb
|
||||
%{__make} -C source4/lib/ldb/ install \
|
||||
DESTDIR=${RPM_BUILD_ROOT} \
|
||||
CONFIGDIR=%{CONFIGDIR}
|
||||
%__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}/ldb
|
||||
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/ldb.pc
|
||||
rm -f ${RPM_BUILD_ROOT}/%{_bindir}/ldbtest
|
||||
rm -f ${RPM_BUILD_ROOT}/%{py_libdir}/site-packages/ldb.so
|
||||
ln -s libldb.so.0.9.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so.0
|
||||
ln -s libldb.so.0.9.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so
|
||||
%if %{link_static_libs} == 0
|
||||
rm ${RPM_BUILD_ROOT}/%{_libdir}/libldb.a
|
||||
%endif
|
||||
# configuration files
|
||||
pushd vendor-files
|
||||
echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf
|
||||
@ -400,7 +384,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 21 11:11:23 UTC 2010 - jmcdonough@suse.de
|
||||
|
||||
- Add "net conf import" error messages; (bso#7378, bnc#598189).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 21 11:22:49 CEST 2010 - jsmeix@suse.de
|
||||
|
||||
- Define cups_lib_dir %{_prefix}/lib/cups for post-11.2 systems; (bnc#575544).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 7 12:08:54 UTC 2010 - lmuelle@suse.de
|
||||
|
||||
@ -253,7 +263,7 @@ Mon Feb 8 18:51:27 CET 2010 - jmcdonough@suse.de
|
||||
Mon Feb 8 11:44:54 UTC 2010 - lmuelle@suse.de
|
||||
|
||||
- Change parameter "wide links" to default to "no"; it's also incompatible
|
||||
with "unix extensions"; (bso#7104); (bnc#577868).
|
||||
with "unix extensions"; CVE-2010-0926; (bso#7104); (bnc#577868).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 7 08:35:14 CET 2010 - boyang@suse.de
|
||||
|
||||
95
samba.spec
95
samba.spec
@ -68,7 +68,7 @@ Group: Productivity/Networking/Samba
|
||||
Url: http://www.samba.org/
|
||||
AutoReqProv: on
|
||||
Version: 3.5.2
|
||||
Release: 1
|
||||
Release: 2
|
||||
%ifarch ppc64
|
||||
Obsoletes: samba-64bit
|
||||
%endif
|
||||
@ -138,6 +138,11 @@ BuildRequires: ccache
|
||||
%define VENDOR %_vendor
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
|
||||
%define cups_lib_dir %{_prefix}/lib/cups
|
||||
%else
|
||||
%define cups_lib_dir %{_libdir}/cups
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -163,7 +168,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package client
|
||||
@ -207,7 +212,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
|
||||
@ -232,7 +237,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%endif
|
||||
@ -260,7 +265,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%endif
|
||||
@ -287,7 +292,7 @@ Authors:
|
||||
--------
|
||||
Jeremy Allison <jra at samba dot org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%if %{make_utils}
|
||||
@ -337,7 +342,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
@ -362,7 +367,7 @@ PreReq: /sbin/ldconfig
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
%description -n libsmbclient
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%else
|
||||
@ -407,7 +412,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libnetapi0
|
||||
@ -426,7 +431,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libnetapi-devel
|
||||
@ -446,7 +451,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
@ -466,7 +471,7 @@ PreReq: /sbin/ldconfig
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
%description -n libsmbsharemodes
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%else
|
||||
@ -501,7 +506,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%if %{make_ldapsmb}
|
||||
@ -522,7 +527,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libtalloc-devel
|
||||
@ -542,7 +547,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libtdb1
|
||||
@ -561,7 +566,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libtdb-devel
|
||||
@ -581,7 +586,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libwbclient0
|
||||
@ -600,7 +605,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libwbclient-devel
|
||||
@ -620,7 +625,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libtevent0
|
||||
@ -639,7 +644,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libtevent-devel
|
||||
@ -660,7 +665,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libldb0
|
||||
@ -680,7 +685,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n libldb-devel
|
||||
@ -701,7 +706,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%package -n ldapsmb
|
||||
@ -710,7 +715,7 @@ Summary: Tool to administer Samba's LDAP backend
|
||||
Group: Productivity/Networking/Samba
|
||||
AutoReqProv: on
|
||||
Version: 1.34b
|
||||
Release: 285
|
||||
Release: 286
|
||||
Requires: perl-ldap
|
||||
|
||||
%description -n ldapsmb
|
||||
@ -723,7 +728,7 @@ Authors:
|
||||
--------
|
||||
Guenther Deschner <guenther at deschner dot de>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%endif
|
||||
@ -746,7 +751,7 @@ Authors:
|
||||
--------
|
||||
Steve French <sfrench at Samba dot org>
|
||||
|
||||
Source Timestamp: 2345
|
||||
Source Timestamp: 2355
|
||||
Branch : trunk
|
||||
|
||||
%endif
|
||||
@ -1026,12 +1031,6 @@ popd
|
||||
%{__make} -C source3/ install \
|
||||
DESTDIR=${RPM_BUILD_ROOT} \
|
||||
CONFIGDIR=%{CONFIGDIR} \
|
||||
# utility scripts
|
||||
scripts="creategroup mksmbpasswd.sh"
|
||||
%__install -d -m 0755 examples/scripts
|
||||
for i in $scripts; do
|
||||
%__install -m 0755 "source3/script/${i}" examples/scripts/${i}
|
||||
done
|
||||
# libtevent
|
||||
%{__make} -C lib/tevent/ install \
|
||||
DESTDIR=${RPM_BUILD_ROOT} \
|
||||
@ -1053,6 +1052,12 @@ ln -s libldb.so.0.9.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so
|
||||
%if %{link_static_libs} == 0
|
||||
rm ${RPM_BUILD_ROOT}/%{_libdir}/libldb.a
|
||||
%endif
|
||||
# utility scripts
|
||||
scripts="creategroup mksmbpasswd.sh"
|
||||
%__install -d -m 0755 examples/scripts
|
||||
for i in $scripts; do
|
||||
%__install -m 0755 "source3/script/${i}" examples/scripts/${i}
|
||||
done
|
||||
# configuration files
|
||||
pushd vendor-files
|
||||
echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf
|
||||
@ -1199,8 +1204,8 @@ install -m 0700 ldapsmb-%{ldapsmb_ver}/ldapsmb ${RPM_BUILD_ROOT}/%{_sbindir}/
|
||||
cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5
|
||||
%endif
|
||||
# cups SMB support
|
||||
mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/cups/backend/
|
||||
touch ${RPM_BUILD_ROOT}/%{_libdir}/cups/backend/smb
|
||||
mkdir -p ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/
|
||||
touch ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/smb
|
||||
# add docs
|
||||
%if %{make_vscan}
|
||||
mv examples/VFS/samba-vscan-%{vscan_ver} .
|
||||
@ -1349,7 +1354,7 @@ if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
|
||||
fi
|
||||
fi
|
||||
if ! test -e %{_bindir}/get_printing_ticket; then
|
||||
ln -fs %{_bindir}/smbspool %{_libdir}/cups/backend/smb
|
||||
ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
|
||||
fi
|
||||
%{?fillup_only:%{fillup_only -nsd dhcp samba-client network}}
|
||||
|
||||
@ -1409,14 +1414,14 @@ fi
|
||||
%endif
|
||||
|
||||
%post krb-printing
|
||||
if test ${1:-0} -eq 1 -a -d %{_libdir}/cups/backend; then
|
||||
ln -fs %{_bindir}/get_printing_ticket %{_libdir}/cups/backend/smb
|
||||
if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then
|
||||
ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb
|
||||
fi
|
||||
%{?run_permissions:%{run_permissions}}
|
||||
|
||||
%postun krb-printing
|
||||
if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{_libdir}/cups/backend; then
|
||||
ln -fs %{_bindir}/smbspool %{_libdir}/cups/backend/smb
|
||||
if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then
|
||||
ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
|
||||
fi
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000
|
||||
%verifyscript krb-printing
|
||||
@ -1646,9 +1651,9 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
|
||||
%{_bindir}/testparm
|
||||
%{_sbindir}/rc%{cifs_init_script}
|
||||
/%{_lib}/libnss_wins.so.2
|
||||
%dir %{_libdir}/cups
|
||||
%dir %{_libdir}/cups/backend
|
||||
%ghost %{_libdir}/cups/backend/smb
|
||||
%dir %{cups_lib_dir}
|
||||
%dir %{cups_lib_dir}/backend
|
||||
%ghost %{cups_lib_dir}/backend/smb
|
||||
%dir %{_libdir}/samba
|
||||
%{_libdir}/samba/charset
|
||||
%{_libdir}/samba/lowcase.dat
|
||||
@ -1784,9 +1789,9 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
|
||||
%else
|
||||
%attr(0750,root,lp) %{_bindir}/get_printing_ticket
|
||||
%endif
|
||||
%dir %{_libdir}/cups
|
||||
%dir %{_libdir}/cups/backend
|
||||
%ghost %{_libdir}/cups/backend/smb
|
||||
%dir %{cups_lib_dir}
|
||||
%dir %{cups_lib_dir}/backend
|
||||
%ghost %{cups_lib_dir}/backend/smb
|
||||
%if %{make_vscan}
|
||||
|
||||
%files vscan
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7e04af849b8d61d916e6a3ea71449d9ee52b4fc009db8c56c3bf60650133c7ce
|
||||
size 24556
|
||||
oid sha256:be920dbaefbb3962bfd48228f37b98af3c17dcdf819f0ea1bb3a0f2feaa479c2
|
||||
size 24548
|
||||
|
||||
Loading…
Reference in New Issue
Block a user