From e131b9d5a5e90e87d8a8346cb96cb5a26135c144 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 3 Jul 2014 16:04:10 -0700 Subject: [PATCH] ceph.spec.in: split out ceph-common as in Debian Move files, postun scriptlet, and add dependencies on ceph-common where appropriate Signed-off-by: Sandon Van Ness --- ceph.spec.in | 89 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 16c601bb04982..8bec01195a2b4 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -19,6 +19,7 @@ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 Requires: librbd1 = %{version}-%{release} Requires: librados2 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release} +Requires: ceph-common = %{version}-%{release} Requires: python Requires: python-argparse Requires: python-ceph @@ -96,6 +97,17 @@ block and file system storage. ################################################################################# # packages ################################################################################# +%package -n ceph-common +Summary: Ceph Common +Group: System Environment/Base +Requires: librbd1 = %{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: python-ceph = %{version}-%{release} +Requires: python-requests +Requires: redhat-lsb-core +%description -n ceph-common +common utilities to mount and interact with a ceph storage cluster + %package fuse Summary: Ceph fuse-based client Group: System Environment/Base @@ -128,6 +140,7 @@ that use Ceph. %package radosgw Summary: Rados REST gateway Group: Development/Libraries +Requires: ceph-common = %{version}-%{release} Requires: librados2 = %{version}-%{release} %if 0%{defined suse_version} BuildRequires: libexpat-devel @@ -223,9 +236,7 @@ object storage. Summary: RESTful benchmark Group: System Environment/Libraries License: LGPL-2.0 -Requires: librados2 = %{version}-%{release} -Requires: librbd1 = %{version}-%{release} -Requires: libcephfs1 = %{version}-%{release} +Requires: ceph-common = %{version}-%{release} %description -n rest-bench RESTful bencher that can be used to benchmark radosgw performance. @@ -380,11 +391,7 @@ fi %restart_on_update ceph %insserv_cleanup %endif -# Package removal cleanup -if [ "$1" -eq "0" ] ; then - rm -rf /var/log/ceph - rm -rf /etc/ceph -fi + ################################################################################# # files @@ -395,31 +402,18 @@ fi %dir %{_docdir}/ceph %{_docdir}/ceph/sample.ceph.conf %{_docdir}/ceph/sample.fetch_config -%{_datadir}/ceph/known_hosts_drop.ceph.com -%{_datadir}/ceph/id_dsa_drop.ceph.com -%{_datadir}/ceph/id_dsa_drop.ceph.com.pub -%{_bindir}/ceph %{_bindir}/cephfs -%{_bindir}/ceph-conf %{_bindir}/ceph-clsinfo %{_bindir}/ceph-rest-api %{_bindir}/crushtool %{_bindir}/monmaptool %{_bindir}/osdmaptool -%{_bindir}/ceph-authtool -%{_bindir}/ceph-syn -%{_bindir}/ceph-post-file -%{_bindir}/ceph-brag -%{_bindir}/ceph-crush-location %{_bindir}/ceph-run %{_bindir}/ceph-mon %{_bindir}/ceph-mds %{_bindir}/ceph-osd %{_bindir}/ceph-rbdnamer -%{_bindir}/ceph-dencoder %{_bindir}/librados-config -%{_bindir}/rados -%{_bindir}/rbd %{_bindir}/ceph-client-debug %{_bindir}/cephfs-journal-tool %{_bindir}/ceph-debugpack @@ -455,37 +449,22 @@ fi %{_libdir}/ceph/erasure-code/libec_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_test_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_missing_entry_point.so* -/lib/udev/rules.d/50-rbd.rules /lib/udev/rules.d/60-ceph-partuuid-workaround.rules /lib/udev/rules.d/95-ceph-osd.rules -%dir %{_sysconfdir}/ceph/ %config %{_sysconfdir}/bash_completion.d/ceph -%config %{_sysconfdir}/bash_completion.d/rados -%config %{_sysconfdir}/bash_completion.d/radosgw-admin -%config %{_sysconfdir}/bash_completion.d/rbd -%{_initrddir}/rbdmap -%config(noreplace) %{_sysconfdir}/ceph/rbdmap %config(noreplace) %{_sysconfdir}/logrotate.d/ceph %config(noreplace) %{_sysconfdir}/logrotate.d/radosgw %{_mandir}/man8/ceph-mon.8* %{_mandir}/man8/ceph-mds.8* %{_mandir}/man8/ceph-osd.8* %{_mandir}/man8/ceph-run.8* -%{_mandir}/man8/ceph-syn.8* -%{_mandir}/man8/ceph-post-file.8* -%{_mandir}/man8/ceph-dencoder.8* %{_mandir}/man8/ceph-rest-api.8* %{_mandir}/man8/crushtool.8* %{_mandir}/man8/osdmaptool.8* %{_mandir}/man8/monmaptool.8* -%{_mandir}/man8/ceph-conf.8* -%{_mandir}/man8/ceph.8* %{_mandir}/man8/cephfs.8* %{_mandir}/man8/mount.ceph.8* -%{_mandir}/man8/rados.8* -%{_mandir}/man8/rbd.8* %{_mandir}/man8/ceph-rbdnamer.8* -%{_mandir}/man8/ceph-authtool.8* %{_mandir}/man8/ceph-debugpack.8* %{_mandir}/man8/ceph-clsinfo.8.gz %{_mandir}/man8/librados-config.8.gz @@ -497,9 +476,45 @@ fi %dir %{_localstatedir}/lib/ceph/mds %dir %{_localstatedir}/lib/ceph/bootstrap-osd %dir %{_localstatedir}/lib/ceph/bootstrap-mds -%dir %{_localstatedir}/log/ceph/ %ghost %dir %{_localstatedir}/run/ceph/ +################################################################################# +%files -n ceph-common +%defattr(-,root,root,-) +%{_bindir}/ceph +%{_bindir}/ceph-authtool +%{_bindir}/ceph-conf +%{_bindir}/ceph-dencoder +%{_bindir}/ceph-syn +%{_bindir}/ceph-crush-location +%{_bindir}/rados +%{_bindir}/rbd +%{_bindir}/ceph-post-file +%{_bindir}/ceph-brag +%{_mandir}/man8/ceph-authtool.8* +%{_mandir}/man8/ceph-conf.8* +%{_mandir}/man8/ceph-dencoder.8* +%{_mandir}/man8/ceph-syn.8* +%{_mandir}/man8/ceph-post-file.8* +%{_mandir}/man8/ceph.8* +%{_mandir}/man8/rados.8* +%{_mandir}/man8/rbd.8* +%{_datadir}/ceph/known_hosts_drop.ceph.com +%{_datadir}/ceph/id_dsa_drop.ceph.com +%{_datadir}/ceph/id_dsa_drop.ceph.com.pub +%dir %{_sysconfdir}/ceph/ +%dir %{_localstatedir}/log/ceph/ +%config %{_sysconfdir}/bash_completion.d/rados +%config %{_sysconfdir}/bash_completion.d/rbd +%config(noreplace) %{_sysconfdir}/ceph/rbdmap +%{_initrddir}/rbdmap + +%postun -n ceph-common +# Package removal cleanup +if [ "$1" -eq "0" ] ; then + rm -rf /var/log/ceph + rm -rf /etc/ceph +fi ################################################################################# %files fuse -- 2.39.5