From 20dcc98fbda4f76bec00c19490f7a31468d91463e855eda6d1fb17b7e336476a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 9 Mar 2011 10:53:01 +0000 Subject: [PATCH 1/3] Define the libwbclient packages ahead of packages with a different version. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=162 --- build-source-timestamp | 2 +- samba-doc.spec | 4 +- samba.changes | 5 + samba.spec | 224 ++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +- 5 files changed, 122 insertions(+), 117 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 9de9268..d5ae435 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2509 +2511 Branch : 3.5.8 diff --git a/samba-doc.spec b/samba-doc.spec index 2adceea..5d6637f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -77,7 +77,7 @@ BuildRequires: pkgconfig %endif Url: http://www.samba.org/ Version: 3.5.8 -Release: 1 +Release: 2 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -420,7 +420,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %changelog diff --git a/samba.changes b/samba.changes index bbe3d67..f63ba33 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 9 10:46:20 UTC 2011 - lmuelle@suse.de + +- Define the libwbclient packages ahead of packages with a different version. + ------------------------------------------------------------------- Mon Mar 7 12:17:06 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 6c9b36a..cf92d89 100644 --- a/samba.spec +++ b/samba.spec @@ -82,7 +82,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.8 -Release: 1 +Release: 2 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package client @@ -230,7 +230,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +257,7 @@ Authors: The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %endif @@ -287,7 +287,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %endif @@ -314,7 +314,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if %{make_utils} @@ -364,7 +364,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,7 +390,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %else @@ -435,7 +435,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libnetapi0 @@ -454,7 +454,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libnetapi-devel @@ -474,7 +474,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -495,7 +495,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %else @@ -531,93 +531,7 @@ Authors: The Samba Team -Source Timestamp: 2509 -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 - -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 - -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 - -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 - -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libwbclient0 @@ -636,7 +550,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libwbclient-devel @@ -656,7 +570,93 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 +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 + +Source Timestamp: 2511 +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 + +Source Timestamp: 2511 +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 + +Source Timestamp: 2511 +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 + +Source Timestamp: 2511 Branch : 3.5.8 %package -n libtevent0 @@ -665,7 +665,7 @@ Summary: Samba tevent Library Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 5 +Release: 6 PreReq: /sbin/ldconfig %description -n libtevent0 @@ -677,7 +677,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libtevent-devel @@ -686,7 +686,7 @@ Summary: Libraries and Header Files to Develop Programs with tevent Suppo Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 5 +Release: 6 Requires: libtevent0 = %{libtevent_ver} %description -n libtevent-devel @@ -700,7 +700,7 @@ Authors: The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libldb0 @@ -709,7 +709,7 @@ Summary: Samba ldb Library Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 5 +Release: 6 PreReq: /sbin/ldconfig %description -n libldb0 @@ -722,7 +722,7 @@ Authors: The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libldb-devel @@ -731,7 +731,7 @@ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 5 +Release: 6 Requires: libldb0 = %{libldb_ver} %description -n libldb-devel @@ -744,7 +744,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if %{make_ldapsmb} @@ -755,7 +755,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 301 +Release: 302 Requires: perl-ldap %description -n ldapsmb @@ -768,7 +768,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %endif @@ -791,7 +791,7 @@ Authors: -------- Steve French -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 0dc296d..aea8a8f 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb59f1f6e561bdf62536d6985a924b553c05fc3d8ba5b7263435414d17febc86 -size 24705 +oid sha256:87e2d366333b6ad41d6827b9c4e969a9d5ce189afbe61f3af7d475805c9aead6 +size 24736 From 658b84bd96fa670ef6e73551005892765596857fc6c608d504f253d14cda2d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 9 Mar 2011 12:03:49 +0000 Subject: [PATCH 2/3] Use %_smp_mflags for parallel building. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=163 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.changes | 5 ++++ samba.spec | 56 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index d5ae435..f7c1bee 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2511 +2512 Branch : 3.5.8 diff --git a/samba-doc.spec b/samba-doc.spec index 5d6637f..fbf659d 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -420,7 +420,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %changelog diff --git a/samba.changes b/samba.changes index f63ba33..6bbcd25 100644 --- a/samba.changes +++ b/samba.changes @@ -3,6 +3,11 @@ 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 diff --git a/samba.spec b/samba.spec index cf92d89..fc9fae6 100644 --- a/samba.spec +++ b/samba.spec @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package client @@ -230,7 +230,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +257,7 @@ Authors: The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %endif @@ -287,7 +287,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %endif @@ -314,7 +314,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %if %{make_utils} @@ -364,7 +364,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,7 +390,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %else @@ -435,7 +435,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libnetapi0 @@ -454,7 +454,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libnetapi-devel @@ -474,7 +474,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -495,7 +495,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %else @@ -531,7 +531,7 @@ Authors: The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libwbclient0 @@ -550,7 +550,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libwbclient-devel @@ -570,7 +570,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libtalloc2 @@ -591,7 +591,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libtalloc-devel @@ -613,7 +613,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libtdb1 @@ -634,7 +634,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libtdb-devel @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libtevent0 @@ -677,7 +677,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libtevent-devel @@ -700,7 +700,7 @@ Authors: The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libldb0 @@ -722,7 +722,7 @@ Authors: The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %package -n libldb-devel @@ -744,7 +744,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %if %{make_ldapsmb} @@ -768,7 +768,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %endif @@ -791,7 +791,7 @@ Authors: -------- Steve French -Source Timestamp: 2511 +Source Timestamp: 2512 Branch : 3.5.8 %endif @@ -994,22 +994,22 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" %else %{__make} proto %endif -%{__make} %{?jobs:-j%jobs} \ +%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} \ everything -#%{__make} %{?jobs:-j%jobs} -C tdb tdbtest tdbtorture +#%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} -C tdb tdbtest tdbtorture %if %{make_vscan} pushd ../examples/VFS/samba-vscan-%{vscan_ver}/ %{?suse_update_config:%{suse_update_config -f}} autoreconf --force --install ./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} --with-samba-source=../../../source3/ -%{__make} %{?jobs:-j%jobs} +%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} popd %endif %if %{make_ldapsmb} pushd ../ldapsmb-%{ldapsmb_ver} ./autogen.sh rm ldapsmb -%{__make} %{?jobs:-j%jobs} all doc +%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} all doc popd %endif popd diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index aea8a8f..80aa8ce 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87e2d366333b6ad41d6827b9c4e969a9d5ce189afbe61f3af7d475805c9aead6 -size 24736 +oid sha256:80e1813063e48f4d6303072fa9eb52d324083b501b1f65694e3e7f2913ac271b +size 24746 From b948c6553a963ce970cf57e7d17a358682f5e726a4b88d6a6c084c97decbfb70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 18 Mar 2011 16:25:03 +0000 Subject: [PATCH 3/3] - 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 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 7 ++++- samba.changes | 10 +++++++ samba.spec | 61 +++++++++++++++++++++++------------------- vendor-files.tar.bz2 | 4 +-- 6 files changed, 54 insertions(+), 34 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index f7c1bee..e586000 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2512 +2516 Branch : 3.5.8 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index d239169..13954c5 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eba8a3b740fba8e3992fd68789302f44a7058a01b53fae91e066eb3c6403a81d -size 76088 +oid sha256:bed0d1ac159f12f0c2afcfff9d2304be6ad4d69698f634421904a43291665901 +size 76325 diff --git a/samba-doc.spec b/samba-doc.spec index fbf659d..ad05fe1 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -75,6 +75,11 @@ BuildRequires: pkgconfig %define libtdb_ver %{version} %define libtevent_ver %{version} %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/ Version: 3.5.8 Release: 2 @@ -420,7 +425,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %changelog diff --git a/samba.changes b/samba.changes index 6bbcd25..9c7bcf8 100644 --- a/samba.changes +++ b/samba.changes @@ -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 diff --git a/samba.spec b/samba.spec index fc9fae6..9185a12 100644 --- a/samba.spec +++ b/samba.spec @@ -75,6 +75,11 @@ BuildRequires: pkgconfig %define libtdb_ver %{version} %define libtevent_ver %{version} %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 ldapsmb_ver 1.34b License: GPLv3+ @@ -184,7 +189,7 @@ Authors: The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package client @@ -230,7 +235,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +262,7 @@ Authors: The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %endif @@ -287,7 +292,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %endif @@ -314,7 +319,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %if %{make_utils} @@ -364,7 +369,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,7 +395,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %else @@ -435,7 +440,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libnetapi0 @@ -454,7 +459,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libnetapi-devel @@ -474,7 +479,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -495,7 +500,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %else @@ -531,7 +536,7 @@ Authors: The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libwbclient0 @@ -550,7 +555,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libwbclient-devel @@ -570,7 +575,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libtalloc2 @@ -591,7 +596,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libtalloc-devel @@ -613,7 +618,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libtdb1 @@ -634,7 +639,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libtdb-devel @@ -656,7 +661,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libtevent0 @@ -677,7 +682,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libtevent-devel @@ -700,7 +705,7 @@ Authors: The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libldb0 @@ -722,7 +727,7 @@ Authors: The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libldb-devel @@ -744,7 +749,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %if %{make_ldapsmb} @@ -768,7 +773,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %endif @@ -791,7 +796,7 @@ Authors: -------- Steve French -Source Timestamp: 2512 +Source Timestamp: 2516 Branch : 3.5.8 %endif @@ -994,22 +999,22 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" %else %{__make} proto %endif -%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} \ +%{__make} %{build_make_smp_mflags} \ everything -#%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} -C tdb tdbtest tdbtorture +#%{__make} %{build_make_smp_mflags} -C tdb tdbtest tdbtorture %if %{make_vscan} pushd ../examples/VFS/samba-vscan-%{vscan_ver}/ %{?suse_update_config:%{suse_update_config -f}} autoreconf --force --install ./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} --with-samba-source=../../../source3/ -%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} +%{__make} %{build_make_smp_mflags} popd %endif %if %{make_ldapsmb} pushd ../ldapsmb-%{ldapsmb_ver} ./autogen.sh rm ldapsmb -%{__make} %{?jobs:-j%jobs} %{?_smp_mflags} all doc +%{__make} %{build_make_smp_mflags} all doc popd %endif popd diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 80aa8ce..5305009 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80e1813063e48f4d6303072fa9eb52d324083b501b1f65694e3e7f2913ac271b -size 24746 +oid sha256:3647f1359aa968eb919968fe160093c72aa33fd52f439a6da91bce7a478fe972 +size 24740