Skip to content
Snippets Groups Projects
Commit 3ddf7f62 authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

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
parent e72938c6
No related branches found
No related tags found
No related merge requests found
...@@ -50,8 +50,9 @@ Group: Applications/Databases ...@@ -50,8 +50,9 @@ Group: Applications/Databases
Summary: In-memory database and Lua application server Summary: In-memory database and Lua application server
License: BSD License: BSD
Provides: tarantool-debuginfo Provides: tarantool-debuginfo = %{version}-%{release}
Requires: tarantool-common Provides: tarantool-common = %{version}-%{release}
Obsoletes: tarantool-common < 1.6.8.434-1
URL: http://tarantool.org URL: http://tarantool.org
Source0: tarantool-%{version}.tar.gz Source0: tarantool-%{version}.tar.gz
%description %description
...@@ -59,7 +60,7 @@ Tarantool is a high performance in-memory NoSQL database and Lua ...@@ -59,7 +60,7 @@ Tarantool is a high performance in-memory NoSQL database and Lua
application server. Tarantool supports replication, online backup and application server. Tarantool supports replication, online backup and
stored procedures in Lua. stored procedures in Lua.
This package provides the server daemon. This package provides the server daemon and admin tools.
%package devel %package devel
Summary: Server development files for %{name} Summary: Server development files for %{name}
...@@ -73,18 +74,6 @@ stored procedures in Lua. ...@@ -73,18 +74,6 @@ stored procedures in Lua.
This package provides server development files needed to create This package provides server development files needed to create
C and Lua/C modules. 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 %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
...@@ -118,7 +107,7 @@ rm -rf %{buildroot}%{_datarootdir}/doc/tarantool/ ...@@ -118,7 +107,7 @@ rm -rf %{buildroot}%{_datarootdir}/doc/tarantool/
-c "Tarantool Server" tarantool > /dev/null 2>&1 || : -c "Tarantool Server" tarantool > /dev/null 2>&1 || :
%endif %endif
%post common %post
%if %{with systemd} %if %{with systemd}
%tmpfiles_create tarantool.conf %tmpfiles_create tarantool.conf
%systemd_post tarantool@.service %systemd_post tarantool@.service
...@@ -127,7 +116,7 @@ chkconfig --add tarantool || : ...@@ -127,7 +116,7 @@ chkconfig --add tarantool || :
service tarantool start || : service tarantool start || :
%endif %endif
%preun common %preun
%if %{with systemd} %if %{with systemd}
%systemd_preun tarantool@.service %systemd_preun tarantool@.service
%else %else
...@@ -135,7 +124,7 @@ service tarantool stop ...@@ -135,7 +124,7 @@ service tarantool stop
chkconfig --del tarantool chkconfig --del tarantool
%endif %endif
%postun common %postun
%if %{with systemd} %if %{with systemd}
%systemd_postun_with_restart tarantool@.service %systemd_postun_with_restart tarantool@.service
%endif %endif
...@@ -147,17 +136,6 @@ chkconfig --del tarantool ...@@ -147,17 +136,6 @@ chkconfig --del tarantool
%{!?_licensedir:%global license %doc} %{!?_licensedir:%global license %doc}
%license LICENSE AUTHORS %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 %{_bindir}/tarantoolctl
%{_mandir}/man1/tarantoolctl.1* %{_mandir}/man1/tarantoolctl.1*
%config(noreplace) %{_sysconfdir}/sysconfig/tarantool %config(noreplace) %{_sysconfdir}/sysconfig/tarantool
...@@ -179,7 +157,19 @@ chkconfig --del tarantool ...@@ -179,7 +157,19 @@ chkconfig --del tarantool
%attr(-,tarantool,tarantool) %dir %{_localstatedir}/run/tarantool/ %attr(-,tarantool,tarantool) %dir %{_localstatedir}/run/tarantool/
%endif %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 %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 * Thu Jan 21 2016 Roman Tsisyk <roman@tarantool.org> 1.6.8.376-1
- Implement proper support of multi-instance management using systemd - Implement proper support of multi-instance management using systemd
* Sat Jan 9 2016 Roman Tsisyk <roman@tarantool.org> 1.6.8.0-1 * Sat Jan 9 2016 Roman Tsisyk <roman@tarantool.org> 1.6.8.0-1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment