SHA256
1
0
forked from pool/samba

- Replace jobs by _smp_mflags macro while calling make on post-11.4 systems.

- Don't crash when publishing a single printer; (bnc#643119).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=164
This commit is contained in:
Lars Müller 2011-03-18 16:25:03 +00:00 committed by Git OBS Bridge
parent 658b84bd96
commit b948c6553a
6 changed files with 54 additions and 34 deletions

View File

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

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

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
Url: http://www.samba.org/ Url: http://www.samba.org/
Version: 3.5.8 Version: 3.5.8
Release: 2 Release: 2
@ -420,7 +425,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%changelog %changelog

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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 Wed Mar 9 10:46:20 UTC 2011 - lmuelle@suse.de

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+
@ -184,7 +189,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 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: 2512 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: 2512 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: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%endif %endif
@ -314,7 +319,7 @@ Authors:
-------- --------
Jeremy Allison <jra at samba dot org> Jeremy Allison <jra at samba dot org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%if %{make_utils} %if %{make_utils}
@ -364,7 +369,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 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 +395,7 @@ PreReq: /sbin/ldconfig
%description -n libsmbclient %description -n libsmbclient
Source Timestamp: 2512 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: 2512 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: 2512 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: 2512 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
@ -495,7 +500,7 @@ PreReq: /sbin/ldconfig
%description -n libsmbsharemodes %description -n libsmbsharemodes
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%else %else
@ -531,7 +536,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libwbclient0 %package -n libwbclient0
@ -550,7 +555,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libwbclient-devel %package -n libwbclient-devel
@ -570,7 +575,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libtalloc2 %package -n libtalloc2
@ -591,7 +596,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libtalloc-devel %package -n libtalloc-devel
@ -613,7 +618,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libtdb1 %package -n libtdb1
@ -634,7 +639,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libtdb-devel %package -n libtdb-devel
@ -656,7 +661,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libtevent0 %package -n libtevent0
@ -677,7 +682,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libtevent-devel %package -n libtevent-devel
@ -700,7 +705,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libldb0 %package -n libldb0
@ -722,7 +727,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%package -n libldb-devel %package -n libldb-devel
@ -744,7 +749,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%if %{make_ldapsmb} %if %{make_ldapsmb}
@ -768,7 +773,7 @@ Authors:
-------- --------
Guenther Deschner <guenther at deschner dot de> Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%endif %endif
@ -791,7 +796,7 @@ Authors:
-------- --------
Steve French <sfrench at Samba dot org> Steve French <sfrench at Samba dot org>
Source Timestamp: 2512 Source Timestamp: 2516
Branch : 3.5.8 Branch : 3.5.8
%endif %endif
@ -994,22 +999,22 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer"
%else %else
%{__make} proto %{__make} proto
%endif %endif
%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} \ %{__make} %{build_make_smp_mflags} \
everything everything
#%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} -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} %{?_smp_mflags} %{__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} %{?_smp_mflags} all doc %{__make} %{build_make_smp_mflags} all doc
popd popd
%endif %endif
popd popd

View File

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