diff --git a/ceph-14.2.1-469-g454d851f0a.tar.bz2 b/ceph-14.2.1-469-g454d851f0a.tar.bz2 deleted file mode 100644 index 9c3f677..0000000 --- a/ceph-14.2.1-469-g454d851f0a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ad74f9f243d5a268e08781e0f09e27f909c95dd4178bed196f2545897467f79 -size 95269506 diff --git a/ceph-14.2.1-475-g83b977ffbd.tar.bz2 b/ceph-14.2.1-475-g83b977ffbd.tar.bz2 new file mode 100644 index 0000000..6b0fed9 --- /dev/null +++ b/ceph-14.2.1-475-g83b977ffbd.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6261414d57cbcc8d84f9a63906c30bb387ab56ea35d8067452fae71907afc634 +size 95256401 diff --git a/ceph-test.changes b/ceph-test.changes index 0324ca9..24de8fc 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 12 11:27:58 UTC 2019 - Nathan Cutler + +- Update to 14.2.1-475-g83b977ffbd: + + packaging: remove SuSEfirewall2 support + ------------------------------------------------------------------- Thu Jul 4 12:10:32 UTC 2019 - Nathan Cutler diff --git a/ceph-test.spec b/ceph-test.spec index c2f4ad0..27d951f 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -100,7 +100,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.2.1.469+g454d851f0a +Version: 14.2.1.475+g83b977ffbd Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -116,7 +116,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.2.1-469-g454d851f0a.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.2.1-475-g83b977ffbd.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -508,7 +508,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-14.2.1-469-g454d851f0a +%autosetup -p1 -n ceph-14.2.1-475-g83b977ffbd %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -661,8 +661,6 @@ install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} -install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-mon %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon -install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds mkdir -p %{buildroot}/sbin ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph %endif @@ -735,8 +733,6 @@ rm -rf %{buildroot}%{_libdir}/libosd_tp.so* rm -rf %{buildroot}%{_sysconfdir}/logrotate.d/ceph rm -rf %{buildroot}%{_sysconfdir}/sysconfig/ceph rm -rf %{buildroot}%{_fillupdir}/sysconfig.* -rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon -rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds rm -rf %{buildroot}%{_unitdir}/ceph.target rm -rf %{buildroot}%{python_sitelib}/ceph_volume/* rm -rf %{buildroot}%{python_sitelib}/ceph_volume-* diff --git a/ceph.changes b/ceph.changes index 0324ca9..24de8fc 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 12 11:27:58 UTC 2019 - Nathan Cutler + +- Update to 14.2.1-475-g83b977ffbd: + + packaging: remove SuSEfirewall2 support + ------------------------------------------------------------------- Thu Jul 4 12:10:32 UTC 2019 - Nathan Cutler diff --git a/ceph.spec b/ceph.spec index 66ac90c..f8ff2bc 100644 --- a/ceph.spec +++ b/ceph.spec @@ -100,7 +100,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.2.1.469+g454d851f0a +Version: 14.2.1.475+g83b977ffbd Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -116,7 +116,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.2.1-469-g454d851f0a.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.2.1-475-g83b977ffbd.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -1088,7 +1088,7 @@ standalone RPM for use in Continuous Integration and ad hoc testing. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.2.1-469-g454d851f0a +%autosetup -p1 -n ceph-14.2.1-475-g83b977ffbd %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -1241,8 +1241,6 @@ install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} -install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-mon %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon -install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds mkdir -p %{buildroot}/sbin ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph %endif @@ -1335,8 +1333,6 @@ rm -rf %{buildroot} %endif %if 0%{?suse_version} %{_fillupdir}/sysconfig.* -%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon -%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %endif %{_unitdir}/ceph.target %if 0%{with python2}