Open Build Service

Changes of Revision 26

rubygem-mail_agent.spec Changed

@@ -21,7 +21,6 @@
 BuildRequires:  %{rubygem gem2rpm}
 BuildRequires:  sysuser-tools
 BuildRoot:      %{_tmppath}/%{mod_full_name}-build
-%sysusers_requires
 
 %description
 Mail agent DB provisioning agent
@@ -31,9 +30,16 @@
 Group:    System/Daemons
 Requires: rubygem(%{mod_name}) = %{version}
 
+%package -n system-user-mail_agent
+Summary:        System user and group mail_agent
+%sysusers_requires
+
 %description -n mail_agent
 Mail agent DB provisioning agent
 
+%description -n system-user-mail_agent
+System user for the mail agent DB provisioning agent
+
 %prep
 
 %build
@@ -46,7 +52,7 @@
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mail_agent.service
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/mail_agent/tomte.yml
 install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/mail_agent/mail_agent.yml
-install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/mail_agent-user.conf
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/system-user-mail_agent.conf
 
 install -d %{buildroot}%{_sbindir}
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcmail_agent
@@ -60,7 +66,6 @@
 %dir %{_sysconfdir}/mail_agent
 %config(noreplace) %{_sysconfdir}/mail_agent/mail_agent.yml
 %config(noreplace) %{_sysconfdir}/mail_agent/tomte.yml
-%{_sysusersdir}/mail_agent-user.conf
 
 %attr(0700, mail_agent, mail_agent) %dir %{_localstatedir}/lib/mail_agent
 
@@ -69,8 +74,12 @@
 
 %{_sbindir}/rcmail_agent
 
+%files -n system-user-mail_agent
+%{_sysusersdir}/system-user-mail_agent.conf
+
+%pre -n system-user-mail_agent -f mail_agent.pre
 
-%pre -n mail_agent -f mail_agent.pre
+%pre -n mail_agent
 %service_add_pre mail_agent.service
 exit 0