Adjust BuildRequire libuuid-devel for Mandriva post-2010 too.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=225
This commit is contained in:
Lars Müller 2012-02-27 23:22:41 +00:00 committed by Git OBS Bridge
parent 45788ee752
commit c8e843ea3a
5 changed files with 35 additions and 35 deletions

View File

@ -1,2 +1,2 @@
2767 2769
Branch : trunk Branch : trunk

View File

@ -26,7 +26,7 @@ BuildRequires: cups-devel
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
BuildRequires: fam-devel BuildRequires: fam-devel
BuildRequires: libacl-devel BuildRequires: libacl-devel
%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 %if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
%endif %endif
BuildRequires: pam-devel BuildRequires: pam-devel
@ -273,7 +273,7 @@ pushd source3
%endif %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
%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 %if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
./autogen.sh ./autogen.sh
%endif %endif
CONFIGURE_OPTIONS="\ CONFIGURE_OPTIONS="\
@ -448,7 +448,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%changelog %changelog

View File

@ -4,7 +4,7 @@ Mon Feb 27 15:57:07 UTC 2012 - lmuelle@suse.de
- Make ldapsmb build with Fedora 15 and 16; (bso#8783). - Make ldapsmb build with Fedora 15 and 16; (bso#8783).
- BuildRequire libuuid-devel for post-11.0 and other systems. - BuildRequire libuuid-devel for post-11.0 and other systems.
- Define missing python macros for non SUSE systems. - Define missing python macros for non SUSE systems.
- PreReq of fillup_prereq and insserv_prereq on SUSE systems. - PreReq to fillup_prereq and insserv_prereq only on SUSE systems.
- Always use cifstab instead of smbfstab on non SUSE systems. - Always use cifstab instead of smbfstab on non SUSE systems.
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -26,7 +26,7 @@ BuildRequires: cups-devel
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
BuildRequires: fam-devel BuildRequires: fam-devel
BuildRequires: libacl-devel BuildRequires: libacl-devel
%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 %if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
%endif %endif
BuildRequires: pam-devel BuildRequires: pam-devel
@ -217,7 +217,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package client %package client
@ -263,7 +263,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -289,7 +289,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%endif %endif
@ -319,7 +319,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%endif %endif
@ -346,7 +346,7 @@ Authors:
-------- --------
Jeremy Allison <jra at samba dot org> Jeremy Allison <jra at samba dot org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%if %{make_utils} %if %{make_utils}
@ -367,7 +367,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%endif %endif
@ -404,7 +404,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -430,14 +430,14 @@ PreReq: /sbin/ldconfig
%description -n libsmbclient %description -n libsmbclient
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%else %else
%description -n libsmbclient0 %description -n libsmbclient0
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%endif %endif
@ -485,7 +485,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libnetapi0 %package -n libnetapi0
@ -503,7 +503,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libnetapi-devel %package -n libnetapi-devel
@ -527,7 +527,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -548,14 +548,14 @@ PreReq: /sbin/ldconfig
%description -n libsmbsharemodes %description -n libsmbsharemodes
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%else %else
%description -n libsmbsharemodes0 %description -n libsmbsharemodes0
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%endif %endif
@ -591,7 +591,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libwbclient0 %package -n libwbclient0
@ -609,7 +609,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libwbclient-devel %package -n libwbclient-devel
@ -633,7 +633,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libtalloc2 %package -n libtalloc2
@ -653,7 +653,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libtalloc-devel %package -n libtalloc-devel
@ -679,7 +679,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libtdb1 %package -n libtdb1
@ -699,7 +699,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libtdb-devel %package -n libtdb-devel
@ -721,7 +721,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libtevent0 %package -n libtevent0
@ -741,7 +741,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libtevent-devel %package -n libtevent-devel
@ -769,7 +769,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libldb1 %package -n libldb1
@ -791,7 +791,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%package -n libldb-devel %package -n libldb-devel
@ -818,7 +818,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%if %{make_ldapsmb} %if %{make_ldapsmb}
@ -841,7 +841,7 @@ Authors:
-------- --------
Guenther Deschner <guenther at deschner dot de> Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2767 Source Timestamp: 2769
Branch : trunk Branch : trunk
%endif %endif
@ -944,7 +944,7 @@ pushd source3
%endif %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
%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 %if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
./autogen.sh ./autogen.sh
%endif %endif
CONFIGURE_OPTIONS="\ CONFIGURE_OPTIONS="\

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:837618605c708d37d6bb53e7986734c01ff62a10122df40ca0f6fea91fa6a396 oid sha256:f40c15c4dd6ce14b1041383d9d97b5df8b8baaafa59b5a232329a0e033c9e544
size 52759 size 52732