From 55bef657bfaab5ab8a25e526c93e9fc0aea23079a464bf4d5124e75fe284fbfa Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 8 Oct 2019 11:12:35 +0000
Subject: [PATCH] Accepting request 736069 from filesystems:ceph:nautilus

reinstate BuildArch: noarch for SLE

OBS-URL: https://build.opensuse.org/request/show/736069
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=56
---
 ceph-iscsi-3.3+1569575733.g93940a4.tar.gz | 3 ---
 ceph-iscsi-3.3+1570532654.g93940a4.tar.gz | 3 +++
 ceph-iscsi.changes                        | 9 +++++++++
 ceph-iscsi.spec                           | 8 +++++++-
 checkin.sh                                | 2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)
 delete mode 100644 ceph-iscsi-3.3+1569575733.g93940a4.tar.gz
 create mode 100644 ceph-iscsi-3.3+1570532654.g93940a4.tar.gz

diff --git a/ceph-iscsi-3.3+1569575733.g93940a4.tar.gz b/ceph-iscsi-3.3+1569575733.g93940a4.tar.gz
deleted file mode 100644
index c539318..0000000
--- a/ceph-iscsi-3.3+1569575733.g93940a4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98c064f789dcc9272c224bdbbd610b3c2e15afbbf15fe02e2410ef2ed9966483
-size 132048
diff --git a/ceph-iscsi-3.3+1570532654.g93940a4.tar.gz b/ceph-iscsi-3.3+1570532654.g93940a4.tar.gz
new file mode 100644
index 0000000..51ea5eb
--- /dev/null
+++ b/ceph-iscsi-3.3+1570532654.g93940a4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5fb71dc0909cd5786c6962423c11ca0b72f6c813e516edb0f69c859342e10fc
+size 132025
diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes
index 5f8c269..2f4b289 100644
--- a/ceph-iscsi.changes
+++ b/ceph-iscsi.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Oct  8 11:05:09 UTC 2019 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 3.3+1570532654.g93940a4:
+  + spec/checkin.sh:
+    * reinstate "BuildArch: noarch" for all distros except openSUSE (i.e.,
+      including SLE, which does not allow arch change in a maintenance update)
+    * "ExclusiveArch" on openSUSE only
+
 -------------------------------------------------------------------
 Fri Sep 27 09:17:57 UTC 2019 - Ricardo Marques <rimarques@suse.com>
 
diff --git a/ceph-iscsi.spec b/ceph-iscsi.spec
index 76a1258..882bf17 100644
--- a/ceph-iscsi.spec
+++ b/ceph-iscsi.spec
@@ -19,7 +19,7 @@
 %endif
 
 Name:           ceph-iscsi
-Version:        3.3+1569575733.g93940a4
+Version:        3.3+1570532654.g93940a4
 Release:        1%{?dist}
 Group:          System/Filesystems
 Summary:        Python modules for Ceph iSCSI gateway configuration management
@@ -33,8 +33,14 @@ Source0:        %{name}-%{version}.tar.gz
 %if 0%{?suse_version}
 Source98:       checkin.sh
 Source99:       README-checkin.txt
+%if 0%{?is_opensuse}
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x
 %endif
+%endif
+
+%if ! 0%{?is_opensuse}
+BuildArch: noarch
+%endif
 
 Obsoletes:      ceph-iscsi-config
 Obsoletes:      ceph-iscsi-cli
diff --git a/checkin.sh b/checkin.sh
index 462557a..5116fb6 100644
--- a/checkin.sh
+++ b/checkin.sh
@@ -98,8 +98,8 @@ VERSION=$(grep ^Version *spec | sed -r "s/^Version:\s+//")
 VERSION="${VERSION}+$(date +%s).${GIT_SHA1}"
 sed -i -e 's/^Version:.*/Version:        '$VERSION'/' $PROJECT.spec
 sed -i -e 's#^Source0:.*#Source0:        %{name}-%{version}.tar.gz#' $PROJECT.spec
-sed -i -e '/Source0/a %if 0%{?suse_version}\nSource98:       checkin.sh\nSource99:       README-checkin.txt\nExclusiveArch:  x86_64 aarch64 ppc64le s390x\n%endif' $PROJECT.spec
 sed -i -e '/BuildArch:\s\+noarch/d' $PROJECT.spec
+sed -i -e '/Source0/a %if 0%{?suse_version}\nSource98:       checkin.sh\nSource99:       README-checkin.txt\n%if 0%{?is_opensuse}\nExclusiveArch:  x86_64 aarch64 ppc64le s390x\n%endif\n%endif\n\n%if ! 0%{?is_opensuse}\nBuildArch: noarch\n%endif' $PROJECT.spec
 sed -i -e 'N;/^\n$/D;P;D;' $PROJECT.spec  # collapse multiple adjacent newlines down to a single newline
 cp $PROJECT.spec $THIS_DIR
 echo "Version number is ->$VERSION<-"