rpm/ceph-iscsi
SHA256
1
0
Fork 0
forked from pool/ceph-iscsi
Code Pull Requests Activity

Accepting request 736071 from filesystems:ceph

Browse Source 
reinstate BuildArch: noarch for SLE (forwarded request 736069 from smithfarm)

OBS-URL: https://build.opensuse.org/request/show/736071
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph-iscsi?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2019-10-08 17:59:48 +00:00 committed by Git OBS Bridge
commit b4bcbe1374
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-iscsi-3.3+1569575733.g93940a4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:98c064f789dcc9272c224bdbbd610b3c2e15afbbf15fe02e2410ef2ed9966483
size 132048

3
ceph-iscsi-3.3+1570532654.g93940a4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5fb71dc0909cd5786c6962423c11ca0b72f6c813e516edb0f69c859342e10fc
size 132025

9
ceph-iscsi.changes
View File

@ -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> Fri Sep 27 09:17:57 UTC 2019 - Ricardo Marques <rimarques@suse.com>

8
ceph-iscsi.spec
View File

@ -19,7 +19,7 @@
%endif %endif
Name: ceph-iscsi Name: ceph-iscsi
Version: 3.3+1569575733.g93940a4 Version: 3.3+1570532654.g93940a4
Release: 1%{?dist} Release: 1%{?dist}
Group: System/Filesystems Group: System/Filesystems
Summary: Python modules for Ceph iSCSI gateway configuration management Summary: Python modules for Ceph iSCSI gateway configuration management
@ -33,8 +33,14 @@ Source0: %{name}-%{version}.tar.gz
%if 0%{?suse_version} %if 0%{?suse_version}
Source98: checkin.sh Source98: checkin.sh
Source99: README-checkin.txt Source99: README-checkin.txt
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64le s390x ExclusiveArch: x86_64 aarch64 ppc64le s390x
%endif %endif
%endif
%if ! 0%{?is_opensuse}
BuildArch: noarch
%endif
Obsoletes: ceph-iscsi-config Obsoletes: ceph-iscsi-config
Obsoletes: ceph-iscsi-cli Obsoletes: ceph-iscsi-cli

2
checkin.sh
View File

@ -98,8 +98,8 @@ VERSION=$(grep ^Version *spec | sed -r "s/^Version:\s+//")
VERSION="${VERSION}+$(date +%s).${GIT_SHA1}" VERSION="${VERSION}+$(date +%s).${GIT_SHA1}"
sed -i -e 's/^Version:.*/Version: '$VERSION'/' $PROJECT.spec sed -i -e 's/^Version:.*/Version: '$VERSION'/' $PROJECT.spec
sed -i -e 's#^Source0:.*#Source0: %{name}-%{version}.tar.gz#' $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 '/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 sed -i -e 'N;/^\n$/D;P;D;' $PROJECT.spec # collapse multiple adjacent newlines down to a single newline
cp $PROJECT.spec $THIS_DIR cp $PROJECT.spec $THIS_DIR
echo "Version number is ->$VERSION<-" echo "Version number is ->$VERSION<-"