From 3ddf7f62722c0151b49513c6e8c7e7f0cb1ad6d2 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Wed, 3 Feb 2016 18:18:08 +0300
Subject: [PATCH] RPM: obsolete tarantool-common package
xxx-common packages is Debian style.
RPM usually doesn't use separate packages for init scripts.
See comments in gh-1120
---
rpm/tarantool.spec | 48 ++++++++++++++++++----------------------------
1 file changed, 19 insertions(+), 29 deletions(-)
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 8b403fb649..18e02628a0 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -50,8 +50,9 @@ Group: Applications/Databases
Summary: In-memory database and Lua application server
License: BSD
-Provides: tarantool-debuginfo
-Requires: tarantool-common
+Provides: tarantool-debuginfo = %{version}-%{release}
+Provides: tarantool-common = %{version}-%{release}
+Obsoletes: tarantool-common < 1.6.8.434-1
URL: http://tarantool.org
Source0: tarantool-%{version}.tar.gz
%description
@@ -59,7 +60,7 @@ Tarantool is a high performance in-memory NoSQL database and Lua
application server. Tarantool supports replication, online backup and
stored procedures in Lua.
-This package provides the server daemon.
+This package provides the server daemon and admin tools.
%package devel
Summary: Server development files for %{name}
@@ -73,18 +74,6 @@ stored procedures in Lua.
This package provides server development files needed to create
C and Lua/C modules.
-%package common
-Summary: Common files and admin tools for %{name}
-Group: Applications/Databases
-BuildArch: noarch
-Requires: tarantool = %{version}-%{release}
-%description common
-Tarantool is a high performance in-memory NoSQL database and Lua
-application server. Tarantool supports replication, online backup and
-stored procedures in Lua.
-
-This package provides common files, admin tools and init scripts.
-
%prep
%setup -q -n %{name}-%{version}
@@ -118,7 +107,7 @@ rm -rf %{buildroot}%{_datarootdir}/doc/tarantool/
-c "Tarantool Server" tarantool > /dev/null 2>&1 || :
%endif
-%post common
+%post
%if %{with systemd}
%tmpfiles_create tarantool.conf
%systemd_post tarantool@.service
@@ -127,7 +116,7 @@ chkconfig --add tarantool || :
service tarantool start || :
%endif
-%preun common
+%preun
%if %{with systemd}
%systemd_preun tarantool@.service
%else
@@ -135,7 +124,7 @@ service tarantool stop
chkconfig --del tarantool
%endif
-%postun common
+%postun
%if %{with systemd}
%systemd_postun_with_restart tarantool@.service
%endif
@@ -147,17 +136,6 @@ chkconfig --del tarantool
%{!?_licensedir:%global license %doc}
%license LICENSE AUTHORS
-%files devel
-%dir %{_includedir}/tarantool
-%{_includedir}/tarantool/lauxlib.h
-%{_includedir}/tarantool/luaconf.h
-%{_includedir}/tarantool/lua.h
-%{_includedir}/tarantool/lua.hpp
-%{_includedir}/tarantool/luajit.h
-%{_includedir}/tarantool/lualib.h
-%{_includedir}/tarantool/module.h
-
-%files common
%{_bindir}/tarantoolctl
%{_mandir}/man1/tarantoolctl.1*
%config(noreplace) %{_sysconfdir}/sysconfig/tarantool
@@ -179,7 +157,19 @@ chkconfig --del tarantool
%attr(-,tarantool,tarantool) %dir %{_localstatedir}/run/tarantool/
%endif
+%files devel
+%dir %{_includedir}/tarantool
+%{_includedir}/tarantool/lauxlib.h
+%{_includedir}/tarantool/luaconf.h
+%{_includedir}/tarantool/lua.h
+%{_includedir}/tarantool/lua.hpp
+%{_includedir}/tarantool/luajit.h
+%{_includedir}/tarantool/lualib.h
+%{_includedir}/tarantool/module.h
+
%changelog
+* Wed Feb 03 2016 Roman Tsisyk <roman@tarantool.org> 1.6.8.433-1
+- Obsolete tarantool-common package
* Thu Jan 21 2016 Roman Tsisyk <roman@tarantool.org> 1.6.8.376-1
- Implement proper support of multi-instance management using systemd
* Sat Jan 9 2016 Roman Tsisyk <roman@tarantool.org> 1.6.8.0-1
--
GitLab