From c579d78228653a4b24765d2a50239d7874226808 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 3 Mar 2018 08:05:19 +0100 Subject: [PATCH] buildpackages: drop suse-specific code in ceph-release.spec The ceph-release RPM is not used on SUSE. Signed-off-by: Nathan Cutler --- teuthology/task/buildpackages/make-rpm.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/teuthology/task/buildpackages/make-rpm.sh b/teuthology/task/buildpackages/make-rpm.sh index 7588aa8bfb..8581ffe3cc 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 -- 2.39.5