From 864f8e3eaf2d8cb129d02476c8fd989a8ab38041446002d47f10c7747b9e6c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 18 Feb 2014 13:34:08 +0000 Subject: [PATCH] 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 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 14 +------------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 376fcf8..8163937 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03bb05af9d5505bd34d4bd1374091e4fca80ee7be40b3b6061177267d2a16d87 -size 158825 +oid sha256:307f0dd91a559973b13a14bfd56ed740f8f4bf3a4d425ef3ff36a77f21fb50b9 +size 158227 diff --git a/samba.changes b/samba.changes index f7049f4..3142c61 100644 --- a/samba.changes +++ b/samba.changes @@ -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 diff --git a/samba.spec b/samba.spec index 892c7c3..8d818ba 100644 --- a/samba.spec +++ b/samba.spec @@ -141,7 +141,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3182 +%define SOURCE_TIMESTAMP 3183 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -153,9 +153,6 @@ Url: http://www.samba.org/ Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} -%ifarch ppc64 -Obsoletes: samba-64bit -%endif Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron @@ -259,9 +256,6 @@ Provides: smbfs Obsoletes: samba-gplv3-client < %{version} Provides: samba-client-gplv2 = %{version} Obsoletes: samba-client-gplv2 < %{version} -%ifarch ppc64 -Obsoletes: samba-client-64bit -%endif %if 0%{?suse_version} > 0 PreReq: %{?fillup_prereq} PreReq: %{?insserv_prereq} @@ -441,9 +435,6 @@ Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd -%ifarch ppc64 -Obsoletes: samba-winbind-64bit -%endif Requires: samba-client >= %{version} %if 0%{?suse_version} Requires: pam-config @@ -1014,9 +1005,6 @@ License: GPL-3.0+ Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif -%ifarch ppc64 -Obsoletes: libsmbclient-64bit -%endif Summary: Samba Client Library Group: System/Libraries PreReq: /sbin/ldconfig diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 42114bc..b869703 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:bf41d3da443a8000fa11f17c6bd481bac83dbf5010c8d107c38180cefe55f903 -size 53864 +oid sha256:e727372c473d1a0cc0b6ca1afe1e5c8f3c4f9719cf38379bc13be12b75fd2156 +size 54202