]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
buildpackages: drop suse-specific code in ceph-release.spec
authorNathan Cutler <ncutler@suse.com>
Sat, 3 Mar 2018 07:05:19 +0000 (08:05 +0100)
committerKyr Shatskyy <kyrylo.shatskyy@suse.com>
Mon, 14 Oct 2019 14:47:01 +0000 (16:47 +0200)
The ceph-release RPM is not used on SUSE.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
teuthology/task/buildpackages/make-rpm.sh

index 7588aa8bfb41255147184f700f6a9d401c248ae4..8581ffe3cc180302f1ab73c2ccc2d15bdc5d272b 100755 (executable)
@@ -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