pool/samba
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 64536 from network:samba:STABLE

Browse Source 
Accepted submit request 64536 from user lmuelle

OBS-URL: https://build.opensuse.org/request/show/64536
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=94
This commit is contained in:
Sascha Peilicke 2011-03-21 08:28:56 +00:00 committed by Git OBS Bridge
commit c84788a030
6 changed files with 155 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-source-timestamp
View File

@ -1,2 +1,2 @@
2509 2516
Branch : 3.5.8 Branch : 3.5.8

4
patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:eba8a3b740fba8e3992fd68789302f44a7058a01b53fae91e066eb3c6403a81d oid sha256:bed0d1ac159f12f0c2afcfff9d2304be6ad4d69698f634421904a43291665901
size 76088 size 76325

9
samba-doc.spec
View File

@ -75,9 +75,14 @@ BuildRequires: pkgconfig
%define libtdb_ver %{version} %define libtdb_ver %{version}
%define libtevent_ver %{version} %define libtevent_ver %{version}
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
%define build_make_smp_mflags %{?_smp_mflags}
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
Url: http://www.samba.org/ Url: http://www.samba.org/
Version: 3.5.8 Version: 3.5.8
Release: 1 Release: 2
License: GPLv3+ License: GPLv3+
Summary: Samba Documentation Summary: Samba Documentation
Group: Documentation/Other Group: Documentation/Other
@ -420,7 +425,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%changelog %changelog

20
samba.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Mar 18 15:53:07 UTC 2011 - lmuelle@suse.de
- Replace jobs by _smp_mflags macro while calling make on post-11.4 systems.
-------------------------------------------------------------------
Thu Mar 17 10:24:31 CET 2011 - ddiss@suse.de
- Don't crash when publishing a single printer; (bnc#643119).
-------------------------------------------------------------------
Wed Mar 9 10:46:20 UTC 2011 - lmuelle@suse.de
- Define the libwbclient packages ahead of packages with a different version.
-------------------------------------------------------------------
Wed Mar 9 00:48:12 UTC 2011 - jengelh@medozas.de
- Use %_smp_mflags for parallel building.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 7 12:17:06 UTC 2011 - lmuelle@suse.de Mon Mar 7 12:17:06 UTC 2011 - lmuelle@suse.de

241
samba.spec
View File

@ -75,6 +75,11 @@ BuildRequires: pkgconfig
%define libtdb_ver %{version} %define libtdb_ver %{version}
%define libtevent_ver %{version} %define libtevent_ver %{version}
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
%define build_make_smp_mflags %{?_smp_mflags}
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define vscan_ver 0.3.6b %define vscan_ver 0.3.6b
%define ldapsmb_ver 1.34b %define ldapsmb_ver 1.34b
License: GPLv3+ License: GPLv3+
@ -82,7 +87,7 @@ Group: Productivity/Networking/Samba
Url: http://www.samba.org/ Url: http://www.samba.org/
AutoReqProv: on AutoReqProv: on
Version: 3.5.8 Version: 3.5.8
Release: 1 Release: 2
Provides: samba-gplv3 = %{version}-%{release} Provides: samba-gplv3 = %{version}-%{release}
Obsoletes: samba-gplv3 < %{version} Obsoletes: samba-gplv3 < %{version}
%ifarch ppc64 %ifarch ppc64
@ -184,7 +189,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package client %package client
@ -230,7 +235,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -257,7 +262,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%endif %endif
@ -287,7 +292,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%endif %endif
@ -314,14 +319,13 @@ Authors:
-------- --------
Jeremy Allison <jra at samba dot org> Jeremy Allison <jra at samba dot org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%if %{make_utils} %if %{make_utils}
%package utils %package utils
Summary: debug tools Summary: debug tools
Group: Productivity/Networking/Samba Group: Productivity/Networking/Samba
AutoReqProv: on AutoReqProv: on
@ -365,7 +369,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -390,7 +394,8 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient %description -n libsmbclient
Source Timestamp: 2509
Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%else %else
@ -435,7 +440,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libnetapi0 %package -n libnetapi0
@ -454,7 +459,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libnetapi-devel %package -n libnetapi-devel
@ -474,7 +479,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -494,7 +499,8 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes %description -n libsmbsharemodes
Source Timestamp: 2509
Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%else %else
@ -530,93 +536,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8
%package -n libtalloc2
License: LGPLv3+
Summary: Samba talloc Library
Group: System/Libraries
AutoReqProv: on
Version: %{libtalloc_ver}
Release: 5
PreReq: /sbin/ldconfig
%description -n libtalloc2
This package includes the talloc library.
Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2509
Branch : 3.5.8
%package -n libtalloc-devel
License: LGPLv3+
Summary: Libraries and Header Files to Develop Programs with talloc Support
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: %{libtalloc_ver}
Release: 5
Requires: libtalloc2 = %{version}
%description -n libtalloc-devel
This package contains the static libraries and header files needed to
develop programs which make use of the talloc programming interface.
Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2509
Branch : 3.5.8
%package -n libtdb1
License: LGPLv3+
Summary: Samba tdb Library
Group: System/Libraries
AutoReqProv: on
Version: %{libtdb_ver}
Release: 5
PreReq: /sbin/ldconfig
%description -n libtdb1
This package includes the tdb library.
Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2509
Branch : 3.5.8
%package -n libtdb-devel
License: LGPLv3+
Summary: Libraries and Header Files to Develop Programs with tdb Support
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: %{libtdb_ver}
Release: 5
Requires: libtdb1 = %{version}
%description -n libtdb-devel
This package contains the static libraries and header files needed to
develop programs which make use of the tdb programming interface.
Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2509
Branch : 3.5.8 Branch : 3.5.8
%package -n libwbclient0 %package -n libwbclient0
@ -635,7 +555,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libwbclient-devel %package -n libwbclient-devel
@ -655,7 +575,93 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8
%package -n libtalloc2
License: LGPLv3+
Summary: Samba talloc Library
Group: System/Libraries
AutoReqProv: on
Version: %{libtalloc_ver}
Release: 6
PreReq: /sbin/ldconfig
%description -n libtalloc2
This package includes the talloc library.
Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2516
Branch : 3.5.8
%package -n libtalloc-devel
License: LGPLv3+
Summary: Libraries and Header Files to Develop Programs with talloc Support
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: %{libtalloc_ver}
Release: 6
Requires: libtalloc2 = %{libtalloc_ver}
%description -n libtalloc-devel
This package contains the static libraries and header files needed to
develop programs which make use of the talloc programming interface.
Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2516
Branch : 3.5.8
%package -n libtdb1
License: LGPLv3+
Summary: Samba tdb Library
Group: System/Libraries
AutoReqProv: on
Version: %{libtdb_ver}
Release: 6
PreReq: /sbin/ldconfig
%description -n libtdb1
This package includes the tdb library.
Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2516
Branch : 3.5.8
%package -n libtdb-devel
License: LGPLv3+
Summary: Libraries and Header Files to Develop Programs with tdb Support
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: %{libtdb_ver}
Release: 6
Requires: libtdb1 = %{libtdb_ver}
%description -n libtdb-devel
This package contains the static libraries and header files needed to
develop programs which make use of the tdb programming interface.
Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libtevent0 %package -n libtevent0
@ -664,7 +670,7 @@ Summary: Samba tevent Library
Group: System/Libraries Group: System/Libraries
AutoReqProv: on AutoReqProv: on
Version: %{libtevent_ver} Version: %{libtevent_ver}
Release: 5 Release: 6
PreReq: /sbin/ldconfig PreReq: /sbin/ldconfig
%description -n libtevent0 %description -n libtevent0
@ -676,7 +682,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libtevent-devel %package -n libtevent-devel
@ -685,7 +691,7 @@ Summary: Libraries and Header Files to Develop Programs with tevent Suppo
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
AutoReqProv: on AutoReqProv: on
Version: %{libtevent_ver} Version: %{libtevent_ver}
Release: 5 Release: 6
Requires: libtevent0 = %{libtevent_ver} Requires: libtevent0 = %{libtevent_ver}
%description -n libtevent-devel %description -n libtevent-devel
@ -699,7 +705,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libldb0 %package -n libldb0
@ -708,7 +714,7 @@ Summary: Samba ldb Library
Group: System/Libraries Group: System/Libraries
AutoReqProv: on AutoReqProv: on
Version: %{libldb_ver} Version: %{libldb_ver}
Release: 5 Release: 6
PreReq: /sbin/ldconfig PreReq: /sbin/ldconfig
%description -n libldb0 %description -n libldb0
@ -721,7 +727,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libldb-devel %package -n libldb-devel
@ -730,7 +736,7 @@ Summary: Libraries and Header Files to Develop Programs with ldb Support
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
AutoReqProv: on AutoReqProv: on
Version: %{libldb_ver} Version: %{libldb_ver}
Release: 5 Release: 6
Requires: libldb0 = %{libldb_ver} Requires: libldb0 = %{libldb_ver}
%description -n libldb-devel %description -n libldb-devel
@ -743,7 +749,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%if %{make_ldapsmb} %if %{make_ldapsmb}
@ -754,7 +760,7 @@ Summary: Tool to administer Samba's LDAP backend
Group: Productivity/Networking/Samba Group: Productivity/Networking/Samba
AutoReqProv: on AutoReqProv: on
Version: 1.34b Version: 1.34b
Release: 301 Release: 302
Requires: perl-ldap Requires: perl-ldap
%description -n ldapsmb %description -n ldapsmb
@ -767,7 +773,7 @@ Authors:
-------- --------
Guenther Deschner <guenther at deschner dot de> Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%endif %endif
@ -790,7 +796,7 @@ Authors:
-------- --------
Steve French <sfrench at Samba dot org> Steve French <sfrench at Samba dot org>
Source Timestamp: 2509 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%endif %endif
@ -993,22 +999,22 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer"
%else %else
%{__make} proto %{__make} proto
%endif %endif
%{__make} %{?jobs:-j%jobs} \ %{__make} %{build_make_smp_mflags} \
everything everything
#%{__make} %{?jobs:-j%jobs} -C tdb tdbtest tdbtorture #%{__make} %{build_make_smp_mflags} -C tdb tdbtest tdbtorture
%if %{make_vscan} %if %{make_vscan}
pushd ../examples/VFS/samba-vscan-%{vscan_ver}/ pushd ../examples/VFS/samba-vscan-%{vscan_ver}/
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}
autoreconf --force --install autoreconf --force --install
./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} --with-samba-source=../../../source3/ ./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} --with-samba-source=../../../source3/
%{__make} %{?jobs:-j%jobs} %{__make} %{build_make_smp_mflags}
popd popd
%endif %endif
%if %{make_ldapsmb} %if %{make_ldapsmb}
pushd ../ldapsmb-%{ldapsmb_ver} pushd ../ldapsmb-%{ldapsmb_ver}
./autogen.sh ./autogen.sh
rm ldapsmb rm ldapsmb
%{__make} %{?jobs:-j%jobs} all doc %{__make} %{build_make_smp_mflags} all doc
popd popd
%endif %endif
popd popd
@ -2001,5 +2007,4 @@ fi
/lib/mkinitrd/scripts/boot-cifs.sh /lib/mkinitrd/scripts/boot-cifs.sh
%endif %endif
%endif %endif
%changelog %changelog

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:cb59f1f6e561bdf62536d6985a924b553c05fc3d8ba5b7263435414d17febc86 oid sha256:3647f1359aa968eb919968fe160093c72aa33fd52f439a6da91bce7a478fe972
size 24705 size 24740