Remove superfluous obsoletes *-64bit in the ifarch ppc64 case; (bnc#437293).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=385
This commit is contained in:
Lars Müller 2014-02-18 13:34:08 +00:00 committed by Git OBS Bridge
parent 302d41fe88
commit 864f8e3eaf
4 changed files with 10 additions and 17 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:03bb05af9d5505bd34d4bd1374091e4fca80ee7be40b3b6061177267d2a16d87 oid sha256:307f0dd91a559973b13a14bfd56ed740f8f4bf3a4d425ef3ff36a77f21fb50b9
size 158825 size 158227

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 18 13:04:37 UTC 2014 - lmuelle@suse.com
- Remove superfluous obsoletes *-64bit in the ifarch ppc64 case; (bnc#437293).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 14 00:31:35 UTC 2014 - ddiss@suse.com Fri Feb 14 00:31:35 UTC 2014 - ddiss@suse.com

View File

@ -141,7 +141,7 @@ BuildRequires: systemd
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 3182 %define SOURCE_TIMESTAMP 3183
%define BRANCH %{version} %define BRANCH %{version}
%global with_mitkrb5 1 %global with_mitkrb5 1
%global with_dc 0 %global with_dc 0
@ -153,9 +153,6 @@ Url: http://www.samba.org/
Group: Productivity/Networking/Samba Group: Productivity/Networking/Samba
Provides: samba-gplv3 = %{version} Provides: samba-gplv3 = %{version}
Obsoletes: samba-gplv3 < %{version} Obsoletes: samba-gplv3 < %{version}
%ifarch ppc64
Obsoletes: samba-64bit
%endif
Requires: samba-client >= %{version} Requires: samba-client >= %{version}
%if 0%{?suse_version} > 1030 %if 0%{?suse_version} > 1030
Recommends: cron Recommends: cron
@ -259,9 +256,6 @@ Provides: smbfs
Obsoletes: samba-gplv3-client < %{version} Obsoletes: samba-gplv3-client < %{version}
Provides: samba-client-gplv2 = %{version} Provides: samba-client-gplv2 = %{version}
Obsoletes: samba-client-gplv2 < %{version} Obsoletes: samba-client-gplv2 < %{version}
%ifarch ppc64
Obsoletes: samba-client-64bit
%endif
%if 0%{?suse_version} > 0 %if 0%{?suse_version} > 0
PreReq: %{?fillup_prereq} PreReq: %{?fillup_prereq}
PreReq: %{?insserv_prereq} PreReq: %{?insserv_prereq}
@ -441,9 +435,6 @@ Group: Productivity/Networking/Samba
Provides: samba-gplv3-winbind = %{version} Provides: samba-gplv3-winbind = %{version}
Obsoletes: samba-gplv3-winbind < %{version} Obsoletes: samba-gplv3-winbind < %{version}
Provides: samba-client:/usr/sbin/winbindd Provides: samba-client:/usr/sbin/winbindd
%ifarch ppc64
Obsoletes: samba-winbind-64bit
%endif
Requires: samba-client >= %{version} Requires: samba-client >= %{version}
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: pam-config Requires: pam-config
@ -1014,9 +1005,6 @@ License: GPL-3.0+
Provides: libsmbclient = %{version} Provides: libsmbclient = %{version}
Obsoletes: libsmbclient Obsoletes: libsmbclient
%endif %endif
%ifarch ppc64
Obsoletes: libsmbclient-64bit
%endif
Summary: Samba Client Library Summary: Samba Client Library
Group: System/Libraries Group: System/Libraries
PreReq: /sbin/ldconfig PreReq: /sbin/ldconfig

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:bf41d3da443a8000fa11f17c6bd481bac83dbf5010c8d107c38180cefe55f903 oid sha256:e727372c473d1a0cc0b6ca1afe1e5c8f3c4f9719cf38379bc13be12b75fd2156
size 53864 size 54202