From 6a26077d5d5d1a537d6e4a85eeb47aff9e19c4be Mon Sep 17 00:00:00 2001 From: Vaidas Jablonskis Date: Sat, 20 Apr 2013 13:33:09 +0100 Subject: [PATCH 1/3] rpm: make sure /run/entrydns is created properly --- dist/fedora/etc/tmpfiles.d/entrydns.conf | 1 + entrydns.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 dist/fedora/etc/tmpfiles.d/entrydns.conf diff --git a/dist/fedora/etc/tmpfiles.d/entrydns.conf b/dist/fedora/etc/tmpfiles.d/entrydns.conf new file mode 100644 index 0000000..076b451 --- /dev/null +++ b/dist/fedora/etc/tmpfiles.d/entrydns.conf @@ -0,0 +1 @@ +d /run/entrydns 0755 entrydns entrydns - diff --git a/entrydns.spec b/entrydns.spec index 1b49d50..df319ec 100644 --- a/entrydns.spec +++ b/entrydns.spec @@ -82,6 +82,7 @@ install -p -d -m 0755 %{buildroot}%{entrydns_root} install -p -d -m 0755 %{buildroot}%{entrydns_root}/log install -p -d -m 0755 %{buildroot}%{entrydns_root}/tmp install -p -d -m 0755 %{buildroot}%{_unitdir} +install -p -d -m 0755 %{buildroot}%{_tmpfilesdir} cp -R app %{buildroot}%{entrydns_root} cp -R config %{buildroot}%{entrydns_root} cp -R db %{buildroot}%{entrydns_root} @@ -97,6 +98,7 @@ cp Rakefile %{buildroot}%{entrydns_root} cp dist/fedora/etc/sysconfig/unicorn-entrydns %{buildroot}%{_sysconfdir}/sysconfig cp dist/fedora/etc/%{name}/unicorn.conf %{buildroot}%{_sysconfdir}/%{name} cp dist/fedora%{_unitdir}/%{entrydns_systemd_unit} %{buildroot}%{_unitdir} +cp dist/fedora/etc/tmpfiles.d/%{name}.conf %{buildroot}%{_tmpfilesdir} %files @@ -119,8 +121,9 @@ cp dist/fedora%{_unitdir}/%{entrydns_systemd_unit} %{buildroot}%{_unitdir} %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/%{name}/unicorn.conf %{_unitdir}/%{entrydns_systemd_unit} %attr(-, %{entrydns_user}, %{entrydns_group}) %{_var}/log/%{name} -#%{_sysconfdir}/%{name} %attr(0755, %{entrydns_user}, %{entrydns_group}) /run/%{name} +%dir /run/%{name} +%{_tmpfilesdir}/%{name}.conf %pre From eae2f8e7abdec7308f52e417c2f1e0d57fe6f968 Mon Sep 17 00:00:00 2001 From: Vaidas Jablonskis Date: Sat, 20 Apr 2013 13:35:17 +0100 Subject: [PATCH 2/3] rpm: bumping version up --- entrydns.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/entrydns.spec b/entrydns.spec index df319ec..9254cc6 100644 --- a/entrydns.spec +++ b/entrydns.spec @@ -7,8 +7,8 @@ %global entrydns_systemd_unit unicorn-entrydns.service Name: entrydns -Version: 0.0.5 -Release: 2%{?dist} +Version: 0.0.6 +Release: 1%{?dist} Summary: Free DNS management service for everyone Group: Applications/Internet @@ -147,6 +147,9 @@ exit 0 %changelog +* Sat Apr 20 2013 Vaidas Jablonskis - 1:0.0.6-1 +- Make sure /run/entrydns is created properly + * Sun Mar 17 2013 Vaidas Jablonskis - 1:0.0.5-2 - Bumped version to 0.0.5 - Fixed pid directory permissions From ab675aed17063a7f7155e4387028e271a2a7e4ed Mon Sep 17 00:00:00 2001 From: Vaidas Jablonskis Date: Sat, 20 Apr 2013 13:40:18 +0100 Subject: [PATCH 3/3] rpm: removed duplicate /run/entrydns listing in the spec --- entrydns.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/entrydns.spec b/entrydns.spec index 9254cc6..2a2338a 100644 --- a/entrydns.spec +++ b/entrydns.spec @@ -121,7 +121,6 @@ cp dist/fedora/etc/tmpfiles.d/%{name}.conf %{buildroot}%{_tmpfilesdir} %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/%{name}/unicorn.conf %{_unitdir}/%{entrydns_systemd_unit} %attr(-, %{entrydns_user}, %{entrydns_group}) %{_var}/log/%{name} -%attr(0755, %{entrydns_user}, %{entrydns_group}) /run/%{name} %dir /run/%{name} %{_tmpfilesdir}/%{name}.conf