- BuildRequire autoconf to avoid implicit dependency for post-11.4 systems.

- Remove call to suse_update_config macro for post-11.4 systems.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=208
This commit is contained in:
Lars Müller 2012-01-02 13:45:41 +00:00 committed by Git OBS Bridge
parent 173b316e95
commit 354d0d7c8b
6 changed files with 62 additions and 32 deletions

View File

@ -1,2 +1,2 @@
2718 2722
Branch : trunk Branch : trunk

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Dec 21 12:59:18 UTC 2011 - coolo@suse.com
- BuildRequire autoconf to avoid implicit dependency for post-11.4 systems.
-------------------------------------------------------------------
Wed Dec 21 10:31:47 UTC 2011 - coolo@suse.com
- Remove call to suse_update_config macro for post-11.4 systems.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 8 14:07:22 CEST 2009 - ro@suse.de Mon Jun 8 14:07:22 CEST 2009 - ro@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package samba-doc # spec file for package samba-doc
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,6 +19,9 @@
Name: samba-doc Name: samba-doc
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
BuildRequires: autoconf
%endif
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
BuildRequires: fam-devel BuildRequires: fam-devel
@ -256,7 +259,9 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -
export CC="ccache gcc" export CC="ccache gcc"
%endif %endif
pushd source3 pushd source3
%if 0%{?suse_version} && 0%{?suse_version} < 1141
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}
%endif
#ln -s m4/aclocal.m4 aclocal.m4 #ln -s m4/aclocal.m4 aclocal.m4
#autoreconf --force --install -I. -Im4 -I../lib/replace #autoreconf --force --install -I. -Im4 -I../lib/replace
./autogen.sh ./autogen.sh
@ -432,7 +437,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%changelog %changelog

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Dec 21 12:59:18 UTC 2011 - coolo@suse.com
- BuildRequire autoconf to avoid implicit dependency for post-11.4 systems.
-------------------------------------------------------------------
Wed Dec 21 10:31:47 UTC 2011 - coolo@suse.com
- Remove call to suse_update_config macro for post-11.4 systems.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 19 23:57:12 UTC 2011 - lmuelle@suse.de Mon Dec 19 23:57:12 UTC 2011 - lmuelle@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package samba # spec file for package samba
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,6 +19,9 @@
Name: samba Name: samba
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
BuildRequires: autoconf
%endif
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
BuildRequires: fam-devel BuildRequires: fam-devel
@ -205,7 +208,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package client %package client
@ -249,7 +252,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -275,7 +278,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%endif %endif
@ -305,7 +308,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%endif %endif
@ -332,7 +335,7 @@ Authors:
-------- --------
Jeremy Allison <jra at samba dot org> Jeremy Allison <jra at samba dot org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%if %{make_utils} %if %{make_utils}
@ -353,7 +356,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%endif %endif
@ -388,7 +391,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -414,14 +417,14 @@ PreReq: /sbin/ldconfig
%description -n libsmbclient %description -n libsmbclient
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%else %else
%description -n libsmbclient0 %description -n libsmbclient0
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%endif %endif
@ -469,7 +472,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libnetapi0 %package -n libnetapi0
@ -487,7 +490,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libnetapi-devel %package -n libnetapi-devel
@ -511,7 +514,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -532,14 +535,14 @@ PreReq: /sbin/ldconfig
%description -n libsmbsharemodes %description -n libsmbsharemodes
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%else %else
%description -n libsmbsharemodes0 %description -n libsmbsharemodes0
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%endif %endif
@ -575,7 +578,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libwbclient0 %package -n libwbclient0
@ -593,7 +596,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libwbclient-devel %package -n libwbclient-devel
@ -617,7 +620,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libtalloc2 %package -n libtalloc2
@ -637,7 +640,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libtalloc-devel %package -n libtalloc-devel
@ -663,7 +666,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libtdb1 %package -n libtdb1
@ -683,7 +686,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libtdb-devel %package -n libtdb-devel
@ -705,7 +708,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libtevent0 %package -n libtevent0
@ -725,7 +728,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libtevent-devel %package -n libtevent-devel
@ -753,7 +756,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libldb1 %package -n libldb1
@ -775,7 +778,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%package -n libldb-devel %package -n libldb-devel
@ -802,7 +805,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%if %{make_ldapsmb} %if %{make_ldapsmb}
@ -825,7 +828,7 @@ Authors:
-------- --------
Guenther Deschner <guenther at deschner dot de> Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2718 Source Timestamp: 2722
Branch : trunk Branch : trunk
%endif %endif
@ -923,7 +926,9 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -
export CC="ccache gcc" export CC="ccache gcc"
%endif %endif
pushd source3 pushd source3
%if 0%{?suse_version} && 0%{?suse_version} < 1141
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}
%endif
#ln -s m4/aclocal.m4 aclocal.m4 #ln -s m4/aclocal.m4 aclocal.m4
#autoreconf --force --install -I. -Im4 -I../lib/replace #autoreconf --force --install -I. -Im4 -I../lib/replace
./autogen.sh ./autogen.sh

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a7cc67a21bd60c4d6b50a52e5b70f45d532e84ec62a684eae97ad2feae3c593e oid sha256:6cb639a600ad1f863759bb62c3cfe0d51255cdd4d39d6529b4eb7b54024db20d
size 52448 size 52374