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

Followup to r484 for conditional libarchive

Browse Source 
Else SLE 11, Fedora, CentOS, and RedHat fails to built.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=485
This commit is contained in:
Lars Müller 2015-09-08 16:16:04 +00:00 committed by Git OBS Bridge
parent 6da8c5f58c
commit 7d3c1b7ba8
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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:200c48e8407b81934abd397d9d481ce05a658de4a0c179d48183998415ba996e oid sha256:2dd5d7bc0f8f887c978f7a87d2ebfe5cac38932ce0f452f66efcda0af11b2a62
size 102801 size 102677

7
samba.spec
View File

@ -144,7 +144,7 @@ BuildRequires: systemd-devel
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 3463 %define SOURCE_TIMESTAMP 3464
%define BRANCH %{version}.SLE12_SP1 %define BRANCH %{version}.SLE12_SP1
%global with_mitkrb5 1 %global with_mitkrb5 1
%global with_dc 0 %global with_dc 0
@ -1143,6 +1143,9 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -
%if 0%{?suse_version} && 0%{?suse_version} < 1141 %if 0%{?suse_version} && 0%{?suse_version} < 1141
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}
%endif %endif
%if 0%{?suse_version} < 1111
bundled_libraries_extra="libarchive"
%endif
CONFIGURE_OPTIONS="\ CONFIGURE_OPTIONS="\
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--localstatedir=%{_localstatedir} \ --localstatedir=%{_localstatedir} \
@ -1183,7 +1186,7 @@ CONFIGURE_OPTIONS="\
%if ! %with_dc %if ! %with_dc
--without-ad-dc \ --without-ad-dc \
%endif %endif
--bundled-libraries=NONE,ntdb,nss_wrapper,socket_wrapper,uid_wrapper,subunit \ --bundled-libraries=NONE,ntdb,nss_wrapper,socket_wrapper,uid_wrapper,subunit,${bundled_libraries_extra} \
" "
./configure ${CONFIGURE_OPTIONS} ./configure ${CONFIGURE_OPTIONS}
make %{build_make_smp_mflags} \ make %{build_make_smp_mflags} \

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:ad47612634e5db144c1b7bb2e2414494836f9b7b7c5f13228314795fa76c84d0 oid sha256:0b5224eb8bf09aa803aa86c4ac250d0685ef7661f4e9c66d98475c8a197c4875
size 52815 size 52812