From: Nathan Cutler <ncutler@suse.com>
Date: Sat, 3 Mar 2018 07:05:19 +0000 (+0100)
Subject: buildpackages: drop suse-specific code in ceph-release.spec
X-Git-Tag: 1.1.0~211^2~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c579d78228653a4b24765d2a50239d7874226808;p=teuthology.git

buildpackages: drop suse-specific code in ceph-release.spec

The ceph-release RPM is not used on SUSE.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/teuthology/task/buildpackages/make-rpm.sh b/teuthology/task/buildpackages/make-rpm.sh
index 7588aa8bf..8581ffe3c 100755
--- a/teuthology/task/buildpackages/make-rpm.sh
+++ b/teuthology/task/buildpackages/make-rpm.sh
@@ -199,16 +199,9 @@ install -pm 644 %{SOURCE0} .
 rm -rf %{buildroot}
 #install -Dpm 644 %{SOURCE0} \
 #    %{buildroot}/%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-CEPH
-%if 0%{defined suse_version}
-install -dm 755 %{buildroot}/%{_sysconfdir}/zypp
-install -dm 755 %{buildroot}/%{_sysconfdir}/zypp/repos.d
-install -pm 644 %{SOURCE0} \
-    %{buildroot}/%{_sysconfdir}/zypp/repos.d
-%else
 install -dm 755 %{buildroot}/%{_sysconfdir}/yum.repos.d
 install -pm 644 %{SOURCE0} \
     %{buildroot}/%{_sysconfdir}/yum.repos.d
-%endif
 
 %clean
 #rm -rf %{buildroot}
@@ -220,11 +213,7 @@ install -pm 644 %{SOURCE0} \
 %files
 %defattr(-,root,root,-)
 #%doc GPL
-%if 0%{defined suse_version}
-/etc/zypp/repos.d/*
-%else
 /etc/yum.repos.d/*
-%endif
 #/etc/pki/rpm-gpg/*
 
 %changelog