Open Build Service

rubygem-mail_agent.spec Changed

@@ -10,40 +10,39 @@
 Group:          Development/Languages/Ruby
 URL:            https://intercom.it
 Source:         %{mod_full_name}.gem
-Source1:        mail_agent.service
-Source2:        mail_agent.tempfiles
+Source1:        mail_agent.tempfiles
+Source2:        mail_agent.service
 Source3:        tomte.yml
 Source4:        mail_agent.yml
-Source5:        system-user-mail_agent.conf
+Source5:        mail_agent.sysuser
 BuildRequires:  ruby-macros >= 5
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  %{ruby >= 1.9}
 BuildRequires:  %{rubygem gem2rpm}
 BuildRequires:  sysuser-tools
-BuildRoot:      %{_tmppath}/%{mod_full_name}-build
+
 
 %description
 Mail agent DB provisioning agent
 
+
 %package -n mail_agent
 Summary:  Mail Database Agent
 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
-%sysusers_generate_pre %{SOURCE5} mail_agent system-user-mail_agent.conf
+%sysusers_generate_pre %{SOURCE5} mail_agent mail_agent.conf
+
 
 %install
 %gem_install -f --symlink-binaries --no-ri --no-rdoc
@@ -52,7 +51,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}/system-user-mail_agent.conf
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/mail_agent.conf
 
 install -d %{buildroot}%{_sbindir}
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcmail_agent
@@ -74,27 +73,24 @@
 
 %{_sbindir}/rcmail_agent
 
-%files -n system-user-mail_agent
-%{_sysusersdir}/system-user-mail_agent.conf
+%{_sysusersdir}/mail_agent.conf
 
-%pre -n system-user-mail_agent -f mail_agent.pre
 
-%pre -n mail_agent
+%pre -n mail_agent -f mail_agent.pre
 %service_add_pre mail_agent.service
-exit 0
+
 
 %preun -n mail_agent
 %service_del_preun mail_agent.service
-exit 0
+
 
 %post -n mail_agent
 %tmpfiles_create %{_tmpfilesdir}/mail_agent.conf
 %service_add_post mail_agent.service
 
-exit 0
 
 %postun -n mail_agent
 %service_del_postun mail_agent.service
-exit 0
+
 
 %changelog

mail_agent.sysuser Added

system-user-mail_agent.conf Deleted

Changes of Revision 27