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

Accepting request 714891 from filesystems:ceph:nautilus

Browse Source 
remove SuSEfirewall2

OBS-URL: https://build.opensuse.org/request/show/714891
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=239
This commit is contained in:
Nathan Cutler 2019-07-12 15:44:43 +00:00 committed by Git OBS Bridge
parent f3d05a0a14
commit ce133db48d
6 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-14.2.1-469-g454d851f0a.tar.bz2
View File

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

3
ceph-14.2.1-475-g83b977ffbd.tar.bz2 Normal file
View File

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

6
ceph-test.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 12 11:27:58 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.1-475-g83b977ffbd:
+ packaging: remove SuSEfirewall2 support
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 4 12:10:32 UTC 2019 - Nathan Cutler <ncutler@suse.com> Thu Jul 4 12:10:32 UTC 2019 - Nathan Cutler <ncutler@suse.com>

10
ceph-test.spec
View File

@ -100,7 +100,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 14.2.1.469+g454d851f0a Version: 14.2.1.475+g83b977ffbd
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 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 Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ 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} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -508,7 +508,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-14.2.1-469-g454d851f0a %autosetup -p1 -n ceph-14.2.1-475-g83b977ffbd
%build %build
# LTO can be enabled as soon as the following GCC bug is fixed: # 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 # firewall templates and /sbin/mount.ceph symlink
%if 0%{?suse_version} %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 mkdir -p %{buildroot}/sbin
ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
%endif %endif
@ -735,8 +733,6 @@ rm -rf %{buildroot}%{_libdir}/libosd_tp.so*
rm -rf %{buildroot}%{_sysconfdir}/logrotate.d/ceph rm -rf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
rm -rf %{buildroot}%{_sysconfdir}/sysconfig/ceph rm -rf %{buildroot}%{_sysconfdir}/sysconfig/ceph
rm -rf %{buildroot}%{_fillupdir}/sysconfig.* 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}%{_unitdir}/ceph.target
rm -rf %{buildroot}%{python_sitelib}/ceph_volume/* rm -rf %{buildroot}%{python_sitelib}/ceph_volume/*
rm -rf %{buildroot}%{python_sitelib}/ceph_volume-* rm -rf %{buildroot}%{python_sitelib}/ceph_volume-*

6
ceph.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 12 11:27:58 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.1-475-g83b977ffbd:
+ packaging: remove SuSEfirewall2 support
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 4 12:10:32 UTC 2019 - Nathan Cutler <ncutler@suse.com> Thu Jul 4 12:10:32 UTC 2019 - Nathan Cutler <ncutler@suse.com>

10
ceph.spec
View File

@ -100,7 +100,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 14.2.1.469+g454d851f0a Version: 14.2.1.475+g83b977ffbd
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 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 Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ 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} %if 0%{?suse_version}
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -1088,7 +1088,7 @@ standalone RPM for use in Continuous Integration and ad hoc testing.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-14.2.1-469-g454d851f0a %autosetup -p1 -n ceph-14.2.1-475-g83b977ffbd
%build %build
# LTO can be enabled as soon as the following GCC bug is fixed: # 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 # firewall templates and /sbin/mount.ceph symlink
%if 0%{?suse_version} %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 mkdir -p %{buildroot}/sbin
ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
%endif %endif
@ -1335,8 +1333,6 @@ rm -rf %{buildroot}
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%{_fillupdir}/sysconfig.* %{_fillupdir}/sysconfig.*
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
%endif %endif
%{_unitdir}/ceph.target %{_unitdir}/ceph.target
%if 0%{with python2} %if 0%{with python2}