SHA256
1
0
forked from pool/ceph

osc copypac from project:filesystems:ceph:jewel package:ceph revision:26

OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=2
This commit is contained in:
2016-02-18 10:03:13 +00:00
committed by Git OBS Bridge
parent 1719e4f7d6
commit 9f06ea75cb
7 changed files with 78 additions and 36 deletions

View File

@@ -11,7 +11,7 @@
</service> </service>
<service name="extract_ceph_spec" mode="disabled" /> <service name="extract_ceph_spec" mode="disabled" />
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="compression">bz2</param> <param name="compression">xz</param>
<param name="file">*.tar</param> <param name="file">*.tar</param>
</service> </service>
<service name="set_version" mode="disabled"> <service name="set_version" mode="disabled">

View File

@@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">git://github.com/SUSE/ceph.git</param> <param name="url">git://github.com/SUSE/ceph.git</param>
<param name="changesrevision">9f9e8dae3587930d983c6e4d32758de07b46d758</param></service></servicedata> <param name="changesrevision">97c7d51a62c56b6b3b0552515dce860da742756b</param></service></servicedata>

View File

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

View File

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

View File

@@ -1,2 +1 @@
addFilter("devel-file-in-non-devel-package .*ceph/erasure-code") # to be used as a last resort
addFilter("devel-file-in-non-devel-package .*rados-classes/libcls_user.so")

View File

@@ -1,8 +1,44 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 07 18:58:22 UTC 2016 - ncutler@suse.com Wed Feb 17 15:33:27 UTC 2016 - ncutler@suse.com
- Update to version 10.0.2+git.1454871191.9f9e8da: - Update to version 10.0.2+git.1455722692.97c7d51:
+ systemd: adapt executable paths to openSUSE (bnc#965286) + src/test/erasure-code/Makefile.am: avoid versioning shared libraries
-------------------------------------------------------------------
Wed Feb 17 11:27:01 UTC 2016 - ncutler@suse.com
- Update to version 10.0.2+git.1455708236.d9d7270:
+ packaging: move ceph_common.sh and ceph-osd-prestart.sh to /usr/lib/ceph
(fixes bnc#965286)
-------------------------------------------------------------------
Wed Feb 17 10:39:25 UTC 2016 - ncutler@suse.com
- Update to version 10.0.2+git.1455705205.1d42c6e:
+ ceph.spec.in: add Prereq: permissions to radosgw package
+ rpm: drop user_rgw and group_rgw template variables
+ rpm: drop systemd_libexec_dir template variable
+ ceph.spec.in: declare /usr/share/ceph properly
+ ceph.spec.in: replace %_with_ocf with %{with ocf} conditional
+ ceph.spec.in: prefix conditionals with 0
+ ceph.spec.in: avoid using %_with_tcmalloc in configure
-------------------------------------------------------------------
Sat Feb 13 14:42:59 UTC 2016 - ncutler@suse.com
- ceph-rpmlintrc: drop "devel-file-in-non-devel-package" filters
-------------------------------------------------------------------
Mon Feb 08 22:22:45 UTC 2016 - ncutler@suse.com
- Update to version 10.0.2+git.1454969713.4d060c0:
+ ceph.spec.in: add copyright notice
+ ceph.spec.in: add license declaration
+ ceph.spec.in: do not mention Fedora-specific patch
+ ceph.spec.in: specify source as local tarball
(all to placate Factory checker script)
- _service: switch to .xz for tarball compression
(recommended by Factory)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 07 16:37:31 UTC 2016 - ncutler@suse.com Sun Feb 07 16:37:31 UTC 2016 - ncutler@suse.com

View File

@@ -1,4 +1,19 @@
# vim: set noexpandtab ts=8 sw=8 : # vim: set noexpandtab ts=8 sw=8 :
#
# spec file for package ceph
#
# Copyright (C) 2004-2016 The Ceph Project Developers. See COPYING file
# at the top-level directory of this distribution and at
# https://github.com/ceph/ceph/blob/master/COPYING
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon.
#
# This file is under the GNU Lesser General Public License, version 2.1
#
# Please submit bugfixes or comments via http://tracker.ceph.com/
#
%bcond_with ocf %bcond_with ocf
%bcond_without cephfs_java %bcond_without cephfs_java
%bcond_with tests %bcond_with tests
@@ -19,7 +34,7 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif %endif
%if %{with selinux} %if 0%{with selinux}
# get selinux policy version # get selinux policy version
%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null || echo 0.0.0)} %{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null || echo 0.0.0)}
@@ -56,7 +71,7 @@ restorecon -R /var/log/ceph > /dev/null 2>&1;
# common # common
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 10.0.2+git.1454871191.9f9e8da Version: 10.0.2+git.1455722692.97c7d51
Release: 0 Release: 0
Summary: User space components of the Ceph file system Summary: User space components of the Ceph file system
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
@@ -64,10 +79,7 @@ License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-auto
Group: System/Filesystems Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.xz
%if 0%{?fedora} || 0%{?rhel}
Patch0: init-ceph.in-fedora.patch
%endif
################################################################################# #################################################################################
# dependencies that apply across all distro families # dependencies that apply across all distro families
################################################################################# #################################################################################
@@ -236,6 +248,7 @@ Requires: python-requests
%{?systemd_requires} %{?systemd_requires}
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
PreReq: permissions
Requires(pre): pwdutils Requires(pre): pwdutils
%endif %endif
# python-argparse is only needed in distros with Python 2.6 or lower # python-argparse is only needed in distros with Python 2.6 or lower
@@ -286,7 +299,7 @@ This package is an S3 HTTP REST gateway for the RADOS object store. It
is implemented as a FastCGI module using libfcgi, and can be used in is implemented as a FastCGI module using libfcgi, and can be used in
conjunction with any FastCGI capable web server. conjunction with any FastCGI capable web server.
%if %{with ocf} %if 0%{with ocf}
%package resource-agents %package resource-agents
Summary: OCF-compliant resource agents for Ceph daemons Summary: OCF-compliant resource agents for Ceph daemons
Group: System Environment/Base Group: System Environment/Base
@@ -566,7 +579,7 @@ done
./autogen.sh ./autogen.sh
%if %{with lowmem_builder} %if 0%{with lowmem_builder}
RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768" RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
%endif %endif
export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'` export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
@@ -591,20 +604,14 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
--with-selinux \ --with-selinux \
%endif %endif
--with-librocksdb-static=check \ --with-librocksdb-static=check \
%if 0%{?rhel} || 0%{?fedora}
--with-systemd-libexec-dir=/usr/libexec/ceph \
--with-rgw-user=root \
--with-rgw-group=root \
%endif
%if 0%{?suse_version}
--with-systemd-libexec-dir=/usr/lib/ceph/ \
--with-rgw-user=wwwrun \
--with-rgw-group=www \
%endif
--with-radosgw \ --with-radosgw \
$CEPH_EXTRA_CONFIGURE_ARGS \ $CEPH_EXTRA_CONFIGURE_ARGS \
%{?_with_ocf} \ %if 0%{with ocf}
%{?_with_tcmalloc} \ --with-ocf \
%endif
%if ! 0%{with tcmalloc}
--without-tcmalloc \
%endif
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
%if %{with lowmem_builder} && ! %{with lowmem_builder_override} %if %{with lowmem_builder} && ! %{with lowmem_builder_override}
@@ -823,9 +830,9 @@ rm -rf $RPM_BUILD_ROOT
%else %else
/sbin/mount.ceph /sbin/mount.ceph
%endif %endif
%dir %{_libdir}/ceph %dir %{_exec_prefix}/lib/ceph
%{_libdir}/ceph/ceph_common.sh %{_exec_prefix}/lib/ceph/ceph_common.sh
%{_libexecdir}/ceph/ceph-osd-prestart.sh %{_exec_prefix}/lib/ceph/ceph-osd-prestart.sh
%dir %{_libdir}/rados-classes %dir %{_libdir}/rados-classes
%{_libdir}/rados-classes/libcls_cephfs.so* %{_libdir}/rados-classes/libcls_cephfs.so*
%{_libdir}/rados-classes/libcls_rbd.so* %{_libdir}/rados-classes/libcls_rbd.so*
@@ -842,6 +849,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/rados-classes/libcls_user.so* %{_libdir}/rados-classes/libcls_user.so*
%{_libdir}/rados-classes/libcls_version.so* %{_libdir}/rados-classes/libcls_version.so*
%{_libdir}/rados-classes/libcls_journal.so* %{_libdir}/rados-classes/libcls_journal.so*
%dir %{_libdir}/ceph
%dir %{_libdir}/ceph/erasure-code %dir %{_libdir}/ceph/erasure-code
%{_libdir}/ceph/erasure-code/libec_*.so* %{_libdir}/ceph/erasure-code/libec_*.so*
%if 0%{?_with_lttng} %if 0%{?_with_lttng}
@@ -925,12 +933,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/rbd-replay.8* %{_mandir}/man8/rbd-replay.8*
%{_mandir}/man8/rbd-replay-many.8* %{_mandir}/man8/rbd-replay-many.8*
%{_mandir}/man8/rbd-replay-prep.8* %{_mandir}/man8/rbd-replay-prep.8*
%dir %{_datadir}/ceph/
%{_datadir}/ceph/known_hosts_drop.ceph.com %{_datadir}/ceph/known_hosts_drop.ceph.com
%{_datadir}/ceph/id_dsa_drop.ceph.com %{_datadir}/ceph/id_dsa_drop.ceph.com
%{_datadir}/ceph/id_dsa_drop.ceph.com.pub %{_datadir}/ceph/id_dsa_drop.ceph.com.pub
%dir %{_sysconfdir}/ceph/ %dir %{_sysconfdir}/ceph/
%dir %{_datarootdir}/ceph/
%dir %{_libexecdir}/ceph/
%config %{_sysconfdir}/bash_completion.d/rados %config %{_sysconfdir}/bash_completion.d/rados
%config %{_sysconfdir}/bash_completion.d/rbd %config %{_sysconfdir}/bash_completion.d/rbd
%config(noreplace) %{_sysconfdir}/ceph/rbdmap %config(noreplace) %{_sysconfdir}/ceph/rbdmap
@@ -1058,7 +1065,7 @@ fi
%endif %endif
################################################################################# #################################################################################
%if %{with ocf} %if 0%{with ocf}
%files resource-agents %files resource-agents
%defattr(0755,root,root,-) %defattr(0755,root,root,-)
%dir /usr/lib/ocf %dir /usr/lib/ocf