diff options
author | Kefu Chai <kchai@redhat.com> | 2019-03-24 15:08:36 +0100 |
---|---|---|
committer | Kefu Chai <kchai@redhat.com> | 2019-03-25 05:47:34 +0100 |
commit | 1cd1967013959831b3b3df501e385083f8a48bb1 (patch) | |
tree | cbbebbb160054174baec16617f0064f65670fe10 /ceph.spec.in | |
parent | Merge pull request #25545 from zhouyuan/wip-ceph-immutable-obj-cache-daemon (diff) | |
download | ceph-1cd1967013959831b3b3df501e385083f8a48bb1.tar.xz ceph-1cd1967013959831b3b3df501e385083f8a48bb1.zip |
rpm: do not use "-n" for immutable-object-cache
as immutable-object-cache has the prefix of "ceph", no need to use "-n"
option. so this change is but a cleanup.
* use "%package immutable-object-cache" not "%package
ceph-immutable-object-cache" for naming subpackage of
"ceph-immutable-object-cache". this would result in package name of
"ceph-immutable-object-cache". see
http://ftp.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
* the same applies to other directives with "-n" options, see
http://ftp.rpm.org/max-rpm/s1-rpm-inside-package-directive.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'ceph.spec.in')
-rw-r--r-- | ceph.spec.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index c8ffc585b4c..5544e0f5967 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -580,14 +580,14 @@ Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} Daemon for mirroring RBD images between Ceph clusters, streaming changes asynchronously. -%package -n ceph-immutable-object-cache +%package immutable-object-cache Summary: Ceph daemon for immutable object cache %if 0%{?suse_version} Group: System/Filesystems %endif Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} -%description -n ceph-immutable-object-cache +%description immutable-object-cache Daemon for immutable object cache. %package -n rbd-nbd @@ -1746,13 +1746,13 @@ if [ $1 -ge 1 ] ; then fi fi -%files -n ceph-immutable-object-cache +%files immutable-object-cache %{_bindir}/ceph-immutable-object-cache %{_mandir}/man8/ceph-immutable-object-cache.8* %{_unitdir}/ceph-immutable-object-cache@.service %{_unitdir}/ceph-immutable-object-cache.target -%post -n ceph-immutable-object-cache +%post immutable-object-cache %if 0%{?suse_version} if [ $1 -eq 1 ] ; then /usr/bin/systemctl preset ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target >/dev/null 2>&1 || : @@ -1765,7 +1765,7 @@ if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-immutable-object-cache.target >/dev/null 2>&1 || : fi -%preun -n ceph-immutable-object-cache +%preun immutable-object-cache %if 0%{?suse_version} %service_del_preun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target %endif @@ -1773,7 +1773,7 @@ fi %systemd_preun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target %endif -%postun -n ceph-immutable-object-cache +%postun immutable-object-cache test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" |