Accepting request 511397 from filesystems:ceph
Upstream 12.1.1 release (forwarded request 511396 from smithfarm) OBS-URL: https://build.opensuse.org/request/show/511397 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=16
This commit is contained in:
commit
b29c6a4a22
2
_service
2
_service
@ -1,6 +1,6 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="versionformat">12.1.0+git.%ct.%h</param>
|
||||
<param name="versionformat">12.1.1+git.%ct.%h</param>
|
||||
<param name="url">git://github.com/SUSE/ceph.git</param>
|
||||
<param name="revision">ses5</param>
|
||||
<param name="filename">ceph</param>
|
||||
|
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">git://github.com/SUSE/ceph.git</param>
|
||||
<param name="changesrevision">20d6a47cc9a08e4013d0492381d62b60f48eed47</param></service></servicedata>
|
||||
<param name="changesrevision">39d2e5f424e5312975852f340d3ca34ef296e6f9</param></service></servicedata>
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9411d6cb465f634b306971c4ad2bff28a7c4662a345267581e58498a6d6016f1
|
||||
size 127005202
|
3
ceph-12.1.1+git.1500447879.e5aac115d7.tar.bz2
Normal file
3
ceph-12.1.1+git.1500447879.e5aac115d7.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f849dc7a137e2c7f5e20280d96463959bf542563936dbb00bf200c20a7a02fdc
|
||||
size 127141620
|
@ -1,3 +1,161 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 19 08:11:53 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.1+git.1500447879.e5aac115d7:
|
||||
+ upstream 12.1.1 (release candidate)
|
||||
+ Other notable changes:
|
||||
* build/ops: rpm: fix typo WTIH_BABELTRACE (pr#16366)
|
||||
* build/ops: rpm: put mgr python build dependencies in make_check bcond
|
||||
(pr#15940)
|
||||
* ceph-disk: support osd new (pr#15432)
|
||||
* ceph: allow '-' with -i and -o for stdin/stdout (pr#16359)
|
||||
* cls/rbd: trash_list should be iterable (pr#16372)
|
||||
* doc: update quick start to add a note for mgr create command for luminous+
|
||||
builds (pr#16350)
|
||||
* libradosstriper: fix format injection vulnerability (pr#15674)
|
||||
* mgr/dashboard: add OSD list view (pr#16373)
|
||||
* mon, osd: misc fixes (pr#16283)
|
||||
* mon/MDSMonitor: fix segv when multiple MDSs raise same alert (pr#16302)
|
||||
* mon/MgrMonitor: fix standby addition to mgrmap (pr#16397)
|
||||
* mon/MgrMonitor: only induce mgr epoch shortly after mkfs (pr#16356)
|
||||
* mon: Fix output text and doc (pr#16367)
|
||||
* mon: add force-create-pg back (pr#16353)
|
||||
* mon: skip crush smoke test when running under valgrind (pr#16346)
|
||||
* os/bluestore: use reference to avoid string copy (pr#16364)
|
||||
* osd: combine conditional statements (pr#16391)
|
||||
* osd: restart boot process if waiting for luminous mons (pr#16341)
|
||||
* rgw: S3 lifecycle now supports expiration date (pr#15807)
|
||||
* rgw: acl grants num limit (pr#16291)
|
||||
* rgw: delete object in error path (pr#16324)
|
||||
* rgw: drop unused find_replacement() and some function docs (pr#16386)
|
||||
* rgw: fix err when copy object in bucket with specified placement rule
|
||||
(pr#15837)
|
||||
* rgw: fix potential null pointer dereference in rgw_admin (pr#15667)
|
||||
* rgw: raise debug level of RGWPostObj_ObjStore_S3::get_policy (pr#16203)
|
||||
* rgw: req xml params size limitation error msg (pr#16310)
|
||||
* rgw_file: add service map registration (pr#16251)
|
||||
* test,rgw: fix rgw placement rule pool config option (pr#16380)
|
||||
* test/fio: print all perfcounters rather than objectstore itself (pr#16339)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 17 13:11:35 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.0+git.1500295948.39d2e5f424:
|
||||
+ spec file:
|
||||
* socat build dependency only for make check
|
||||
* fix typo WTIH_BABELTRACE
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 17 10:42:27 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.0+git.1500284183.1ed97736ab:
|
||||
+ Spec file changes:
|
||||
* bump epoch (not relevant for SUSE)
|
||||
* add socat buildrequires
|
||||
* libcephfs2 now obsoletes libcephfs1 (bsc#1047020)
|
||||
* HAVE_BABELTRACE option renamed to WITH_BABELTRACE
|
||||
* fix a regression in ceph-base %postun scriptlet
|
||||
+ Selected other changes:
|
||||
* Revert "msg/async: increase worker reference with local listen table enabled backend"
|
||||
* build: build erasure-code isa lib without versions
|
||||
* ceph-disk/ceph_disk/main.py: Replace ST_ISBLK() test by is_diskdevice()
|
||||
* ceph.in: filter out audit from ceph -w
|
||||
* common,config: OPT_FLOAT and OPT_DOUBLE output format in config show
|
||||
* common/Timer: do not add event if already shutdown
|
||||
* compressor/zlib: remove g_ceph_context/g_conf from compressor plugin
|
||||
* core: make the conversion from wire error to host OS work
|
||||
* core:" Stringify needs access to << before reference" src/include/stringify.h
|
||||
* crush/CrushWrapper: make get_immediate_parent[_id] ignore per-class shadow hierarchy
|
||||
* doc/mgr/dashboard: update dashboard docs to reflect new defaults
|
||||
* doc/rados.8: add offset option for put command
|
||||
* doc: fix link for ceph-mgr cephx authorization
|
||||
* doc: update intro, quick start docs
|
||||
* isa-l: update isa-l to v2.18
|
||||
* librbd: fail IO request when exclusive lock cannot be obtained
|
||||
* mgr,librados: service map
|
||||
* mgr,mon: debug init and mgrdigest subscriptions
|
||||
* mgr,mon: enable/disable mgr modules via 'ceph mgr module ...' commands
|
||||
* mgr/ClusterState: do not mangle PGMap outside of Incremental
|
||||
* mgr/restful: bind to :: and update docs
|
||||
* mgr: Zabbix monitoring module
|
||||
* mon,crush: create crush rules using device classes for replicated and ec pools via cli
|
||||
* mon/MgrStatMonitor: do not crash on luminous dev version upgrades
|
||||
* mon/MonClient: respect the priority in SRV RR
|
||||
* mon/Monitor: recreate mon session if features changed
|
||||
* mon/OSDMonitor: do not allow crush device classes until luminous
|
||||
* mon/OSDMonitor: guard 'osd crush set-device-class'
|
||||
* mon/mgr: add detail error infomation
|
||||
* mon: Fix status output warning for mon_warn_osd_usage_min_max_delta
|
||||
* mon: add support public_bind_addr option
|
||||
* mon: collect mon metdata as part of the election
|
||||
* mon: debug session feature tracking
|
||||
* mon: do crushtool test with fork and timeout, but w/o exec of crushtool
|
||||
* mon: fix hang on deprecated/removed 'pg set_\*full_ratio' commands
|
||||
* mon: include device class in tree view; hide shadow hierarchy
|
||||
* mon: maintain the "cluster" PerfCounters when using ceph-mgr
|
||||
* mon: revamp health check/warning system
|
||||
* msg/async: increase worker reference with local listen table enabled backend
|
||||
* msg/async: make recv_stamp more precise
|
||||
* msg: QueueStrategy::wait() joins all threads
|
||||
* msg: make listen backlog an option, increase from 128 to 512
|
||||
* os/blueStore: Failure retry for opening file
|
||||
* os/bluestore/BlueFS: clean up log_writer aios from compaction
|
||||
* os/bluestore/BlueFS: clear current log entrys before dump all fnode
|
||||
* os/bluestore/KernelDevice: batch aio submit
|
||||
* os/bluestore: Make BitmapFreelistManager kv itereator short lived
|
||||
* os/bluestore: cap rocksdb cache size
|
||||
* os/bluestore: clear up redundant size assignment in KernelDevice
|
||||
* os/bluestore: differ default cache size for hdd/ssd backends
|
||||
* os/bluestore: fix deferred_aio deadlock
|
||||
* os/bluestore: move object exist in assign nid
|
||||
* os/bluestore: only submit deferred if there is any
|
||||
* os/bluestore: reduce some overhead for _do_clone_range() and _do_remove()
|
||||
* os/bluestore: use bufferlist functions whenever possible
|
||||
* os/filestore/FileJournal: FileJournal::open() close journal file before return error
|
||||
* os/filestore/HashIndex: randomize split threshold by a configurable amount
|
||||
* os/filestore: call committed_thru when no journal entries are replayed
|
||||
* os/filestore: do not free event if not added
|
||||
* os/filestore: queue ondisk completion before apply work
|
||||
* os/filestore: require experimental flag for btrfs
|
||||
* osd/OSD: auto class on osd start up
|
||||
* osd/PrimaryLogPG solve cache tier osd high memory consumption
|
||||
* osd/ReplicatedBackend: reset thread heartbeat after every omap entry
|
||||
* osd/filestore: Revert "os/filestore: move ondisk in front
|
||||
* osd: Check for and automatically repair object info soid during scrub
|
||||
* osd: Preserve OSDOp information for historic ops
|
||||
* osd: check queue_transaction return value
|
||||
* osd: clear_queued_recovery() in on_shutdown()
|
||||
* osd: compact osd feature
|
||||
* pybind/mgr/dashboard: bind to :: by default
|
||||
* pybind/mgr/dashboard: fix get kernel_version error
|
||||
* rbd-mirror: ignore permission errors on rbd_mirroring object
|
||||
* rbd: do not attempt to load key if auth is disabled
|
||||
* rgw: fix compilation with cryptopp
|
||||
* rgw,test: fix rgw placement rule pool config option
|
||||
* rgw/rgw_frontend.h: Return negative value for empty uid in RGWLoadGenFrontend::init()
|
||||
* rgw/rgw_rados: Remove duplicate calls in RGWRados::finalize()
|
||||
* rgw: /info claims we do support Swift's accounts ACLs
|
||||
* rgw: Correcting the condition in ceph_assert while parsing an AWS Principal
|
||||
* rgw: Do not fetch bucket stats by default upon bucket listing
|
||||
* rgw: Fix a bug that multipart upload may exceed the quota
|
||||
* rgw: Initialize pointer fields
|
||||
* rgw: fix leaks with incomplete multiparts
|
||||
* rgw: fix memory leak in copy_obj_to_remote_dest
|
||||
* rgw: fix not initialized vars which cause rgw crash with ec data pool
|
||||
* rgw: fix radosgw-admin data sync run crash
|
||||
* rgw: fix s3 object uploads with chunked transfers and v4 signatures
|
||||
* rgw: fix the subdir without slash of s3 website url
|
||||
* rgw: fix zone did't update realm_id when added to zonegroup
|
||||
* rgw: log_meta only for more than one zone
|
||||
* rgw: rgw_file skip policy read for virtual components
|
||||
* rgw: using RGW_OBJ_NS_MULTIPART in check_bad_index_multipart
|
||||
* rgw: verify md5 in post obj
|
||||
* rgw_file: add compression interop to RGW NFS
|
||||
* rgw:fix s3 aws v2 signature priority between header['X-Amz-Date'] and header['Date']
|
||||
* vstart.sh: bind restful, dashboard to ::, not 127.0.0.1
|
||||
* vstart: add --rgw_compression to set rgw compression plugin
|
||||
* vstart: allow to start multiple radosgw when RGW=x
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 3 19:41:29 UTC 2017 - ncutler@suse.com
|
||||
|
||||
|
@ -69,10 +69,10 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph-test
|
||||
Version: 12.1.0+git.1499090920.2c11b88d14
|
||||
Version: 12.1.1+git.1500447879.e5aac115d7
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 1
|
||||
Epoch: 2
|
||||
%endif
|
||||
|
||||
# define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined
|
||||
@ -126,6 +126,7 @@ BuildRequires: python-CherryPy
|
||||
BuildRequires: python-Werkzeug
|
||||
%endif
|
||||
BuildRequires: python-pecan
|
||||
BuildRequires: socat
|
||||
%endif
|
||||
BuildRequires: bc
|
||||
BuildRequires: gperf
|
||||
@ -437,10 +438,10 @@ cmake .. \
|
||||
%endif
|
||||
%if %{with lttng}
|
||||
-DWITH_LTTNG=ON \
|
||||
-DHAVE_BABELTRACE=ON \
|
||||
-DWITH_BABELTRACE=ON \
|
||||
%else
|
||||
-DWITH_LTTNG=OFF \
|
||||
-DHAVE_BABELTRACE=OFF \
|
||||
-DWITH_BABELTRACE=OFF \
|
||||
%endif
|
||||
$CEPH_EXTRA_CMAKE_ARGS \
|
||||
%if 0%{with ocf}
|
||||
|
158
ceph.changes
158
ceph.changes
@ -1,3 +1,161 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 19 08:11:53 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.1+git.1500447879.e5aac115d7:
|
||||
+ upstream 12.1.1 (release candidate)
|
||||
+ Other notable changes:
|
||||
* build/ops: rpm: fix typo WTIH_BABELTRACE (pr#16366)
|
||||
* build/ops: rpm: put mgr python build dependencies in make_check bcond
|
||||
(pr#15940)
|
||||
* ceph-disk: support osd new (pr#15432)
|
||||
* ceph: allow '-' with -i and -o for stdin/stdout (pr#16359)
|
||||
* cls/rbd: trash_list should be iterable (pr#16372)
|
||||
* doc: update quick start to add a note for mgr create command for luminous+
|
||||
builds (pr#16350)
|
||||
* libradosstriper: fix format injection vulnerability (pr#15674)
|
||||
* mgr/dashboard: add OSD list view (pr#16373)
|
||||
* mon, osd: misc fixes (pr#16283)
|
||||
* mon/MDSMonitor: fix segv when multiple MDSs raise same alert (pr#16302)
|
||||
* mon/MgrMonitor: fix standby addition to mgrmap (pr#16397)
|
||||
* mon/MgrMonitor: only induce mgr epoch shortly after mkfs (pr#16356)
|
||||
* mon: Fix output text and doc (pr#16367)
|
||||
* mon: add force-create-pg back (pr#16353)
|
||||
* mon: skip crush smoke test when running under valgrind (pr#16346)
|
||||
* os/bluestore: use reference to avoid string copy (pr#16364)
|
||||
* osd: combine conditional statements (pr#16391)
|
||||
* osd: restart boot process if waiting for luminous mons (pr#16341)
|
||||
* rgw: S3 lifecycle now supports expiration date (pr#15807)
|
||||
* rgw: acl grants num limit (pr#16291)
|
||||
* rgw: delete object in error path (pr#16324)
|
||||
* rgw: drop unused find_replacement() and some function docs (pr#16386)
|
||||
* rgw: fix err when copy object in bucket with specified placement rule
|
||||
(pr#15837)
|
||||
* rgw: fix potential null pointer dereference in rgw_admin (pr#15667)
|
||||
* rgw: raise debug level of RGWPostObj_ObjStore_S3::get_policy (pr#16203)
|
||||
* rgw: req xml params size limitation error msg (pr#16310)
|
||||
* rgw_file: add service map registration (pr#16251)
|
||||
* test,rgw: fix rgw placement rule pool config option (pr#16380)
|
||||
* test/fio: print all perfcounters rather than objectstore itself (pr#16339)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 17 13:11:35 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.0+git.1500295948.39d2e5f424:
|
||||
+ spec file:
|
||||
* socat build dependency only for make check
|
||||
* fix typo WTIH_BABELTRACE
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 17 10:42:27 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.0+git.1500284183.1ed97736ab:
|
||||
+ Spec file changes:
|
||||
* bump epoch (not relevant for SUSE)
|
||||
* add socat buildrequires
|
||||
* libcephfs2 now obsoletes libcephfs1 (bsc#1047020)
|
||||
* HAVE_BABELTRACE option renamed to WITH_BABELTRACE
|
||||
* fix a regression in ceph-base %postun scriptlet
|
||||
+ Selected other changes:
|
||||
* Revert "msg/async: increase worker reference with local listen table enabled backend"
|
||||
* build: build erasure-code isa lib without versions
|
||||
* ceph-disk/ceph_disk/main.py: Replace ST_ISBLK() test by is_diskdevice()
|
||||
* ceph.in: filter out audit from ceph -w
|
||||
* common,config: OPT_FLOAT and OPT_DOUBLE output format in config show
|
||||
* common/Timer: do not add event if already shutdown
|
||||
* compressor/zlib: remove g_ceph_context/g_conf from compressor plugin
|
||||
* core: make the conversion from wire error to host OS work
|
||||
* core:" Stringify needs access to << before reference" src/include/stringify.h
|
||||
* crush/CrushWrapper: make get_immediate_parent[_id] ignore per-class shadow hierarchy
|
||||
* doc/mgr/dashboard: update dashboard docs to reflect new defaults
|
||||
* doc/rados.8: add offset option for put command
|
||||
* doc: fix link for ceph-mgr cephx authorization
|
||||
* doc: update intro, quick start docs
|
||||
* isa-l: update isa-l to v2.18
|
||||
* librbd: fail IO request when exclusive lock cannot be obtained
|
||||
* mgr,librados: service map
|
||||
* mgr,mon: debug init and mgrdigest subscriptions
|
||||
* mgr,mon: enable/disable mgr modules via 'ceph mgr module ...' commands
|
||||
* mgr/ClusterState: do not mangle PGMap outside of Incremental
|
||||
* mgr/restful: bind to :: and update docs
|
||||
* mgr: Zabbix monitoring module
|
||||
* mon,crush: create crush rules using device classes for replicated and ec pools via cli
|
||||
* mon/MgrStatMonitor: do not crash on luminous dev version upgrades
|
||||
* mon/MonClient: respect the priority in SRV RR
|
||||
* mon/Monitor: recreate mon session if features changed
|
||||
* mon/OSDMonitor: do not allow crush device classes until luminous
|
||||
* mon/OSDMonitor: guard 'osd crush set-device-class'
|
||||
* mon/mgr: add detail error infomation
|
||||
* mon: Fix status output warning for mon_warn_osd_usage_min_max_delta
|
||||
* mon: add support public_bind_addr option
|
||||
* mon: collect mon metdata as part of the election
|
||||
* mon: debug session feature tracking
|
||||
* mon: do crushtool test with fork and timeout, but w/o exec of crushtool
|
||||
* mon: fix hang on deprecated/removed 'pg set_\*full_ratio' commands
|
||||
* mon: include device class in tree view; hide shadow hierarchy
|
||||
* mon: maintain the "cluster" PerfCounters when using ceph-mgr
|
||||
* mon: revamp health check/warning system
|
||||
* msg/async: increase worker reference with local listen table enabled backend
|
||||
* msg/async: make recv_stamp more precise
|
||||
* msg: QueueStrategy::wait() joins all threads
|
||||
* msg: make listen backlog an option, increase from 128 to 512
|
||||
* os/blueStore: Failure retry for opening file
|
||||
* os/bluestore/BlueFS: clean up log_writer aios from compaction
|
||||
* os/bluestore/BlueFS: clear current log entrys before dump all fnode
|
||||
* os/bluestore/KernelDevice: batch aio submit
|
||||
* os/bluestore: Make BitmapFreelistManager kv itereator short lived
|
||||
* os/bluestore: cap rocksdb cache size
|
||||
* os/bluestore: clear up redundant size assignment in KernelDevice
|
||||
* os/bluestore: differ default cache size for hdd/ssd backends
|
||||
* os/bluestore: fix deferred_aio deadlock
|
||||
* os/bluestore: move object exist in assign nid
|
||||
* os/bluestore: only submit deferred if there is any
|
||||
* os/bluestore: reduce some overhead for _do_clone_range() and _do_remove()
|
||||
* os/bluestore: use bufferlist functions whenever possible
|
||||
* os/filestore/FileJournal: FileJournal::open() close journal file before return error
|
||||
* os/filestore/HashIndex: randomize split threshold by a configurable amount
|
||||
* os/filestore: call committed_thru when no journal entries are replayed
|
||||
* os/filestore: do not free event if not added
|
||||
* os/filestore: queue ondisk completion before apply work
|
||||
* os/filestore: require experimental flag for btrfs
|
||||
* osd/OSD: auto class on osd start up
|
||||
* osd/PrimaryLogPG solve cache tier osd high memory consumption
|
||||
* osd/ReplicatedBackend: reset thread heartbeat after every omap entry
|
||||
* osd/filestore: Revert "os/filestore: move ondisk in front
|
||||
* osd: Check for and automatically repair object info soid during scrub
|
||||
* osd: Preserve OSDOp information for historic ops
|
||||
* osd: check queue_transaction return value
|
||||
* osd: clear_queued_recovery() in on_shutdown()
|
||||
* osd: compact osd feature
|
||||
* pybind/mgr/dashboard: bind to :: by default
|
||||
* pybind/mgr/dashboard: fix get kernel_version error
|
||||
* rbd-mirror: ignore permission errors on rbd_mirroring object
|
||||
* rbd: do not attempt to load key if auth is disabled
|
||||
* rgw: fix compilation with cryptopp
|
||||
* rgw,test: fix rgw placement rule pool config option
|
||||
* rgw/rgw_frontend.h: Return negative value for empty uid in RGWLoadGenFrontend::init()
|
||||
* rgw/rgw_rados: Remove duplicate calls in RGWRados::finalize()
|
||||
* rgw: /info claims we do support Swift's accounts ACLs
|
||||
* rgw: Correcting the condition in ceph_assert while parsing an AWS Principal
|
||||
* rgw: Do not fetch bucket stats by default upon bucket listing
|
||||
* rgw: Fix a bug that multipart upload may exceed the quota
|
||||
* rgw: Initialize pointer fields
|
||||
* rgw: fix leaks with incomplete multiparts
|
||||
* rgw: fix memory leak in copy_obj_to_remote_dest
|
||||
* rgw: fix not initialized vars which cause rgw crash with ec data pool
|
||||
* rgw: fix radosgw-admin data sync run crash
|
||||
* rgw: fix s3 object uploads with chunked transfers and v4 signatures
|
||||
* rgw: fix the subdir without slash of s3 website url
|
||||
* rgw: fix zone did't update realm_id when added to zonegroup
|
||||
* rgw: log_meta only for more than one zone
|
||||
* rgw: rgw_file skip policy read for virtual components
|
||||
* rgw: using RGW_OBJ_NS_MULTIPART in check_bad_index_multipart
|
||||
* rgw: verify md5 in post obj
|
||||
* rgw_file: add compression interop to RGW NFS
|
||||
* rgw:fix s3 aws v2 signature priority between header['X-Amz-Date'] and header['Date']
|
||||
* vstart.sh: bind restful, dashboard to ::, not 127.0.0.1
|
||||
* vstart: add --rgw_compression to set rgw compression plugin
|
||||
* vstart: allow to start multiple radosgw when RGW=x
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 3 19:41:29 UTC 2017 - ncutler@suse.com
|
||||
|
||||
|
11
ceph.spec
11
ceph.spec
@ -69,10 +69,10 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 12.1.0+git.1499090920.2c11b88d14
|
||||
Version: 12.1.1+git.1500447879.e5aac115d7
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 1
|
||||
Epoch: 2
|
||||
%endif
|
||||
|
||||
# define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined
|
||||
@ -120,6 +120,7 @@ BuildRequires: python-CherryPy
|
||||
BuildRequires: python-Werkzeug
|
||||
%endif
|
||||
BuildRequires: python-pecan
|
||||
BuildRequires: socat
|
||||
%endif
|
||||
BuildRequires: bc
|
||||
BuildRequires: gperf
|
||||
@ -628,6 +629,7 @@ Summary: Ceph distributed file system client library
|
||||
%if 0%{?suse_version}
|
||||
Group: System/Libraries
|
||||
%endif
|
||||
Obsoletes: libcephfs1
|
||||
%if 0%{?rhel} || 0%{?fedora}
|
||||
Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release}
|
||||
Obsoletes: ceph-libcephfs
|
||||
@ -861,10 +863,10 @@ cmake .. \
|
||||
%endif
|
||||
%if %{with lttng}
|
||||
-DWITH_LTTNG=ON \
|
||||
-DHAVE_BABELTRACE=ON \
|
||||
-DWITH_BABELTRACE=ON \
|
||||
%else
|
||||
-DWITH_LTTNG=OFF \
|
||||
-DHAVE_BABELTRACE=OFF \
|
||||
-DWITH_BABELTRACE=OFF \
|
||||
%endif
|
||||
$CEPH_EXTRA_CMAKE_ARGS \
|
||||
%if 0%{with ocf}
|
||||
@ -1063,6 +1065,7 @@ fi
|
||||
|
||||
%postun base
|
||||
/sbin/ldconfig
|
||||
test -n "$FIRST_ARG" || FIRST_ARG=$1
|
||||
%if 0%{?suse_version}
|
||||
DISABLE_RESTART_ON_UPDATE="yes"
|
||||
%service_del_postun ceph-disk@\*.service ceph.target
|
||||
|
Loading…
x
Reference in New Issue
Block a user