[firebird/f16] Better systemd support fix rh #757624
Philippe Makowski
makowski at fedoraproject.org
Mon Nov 28 20:46:55 UTC 2011
commit aced7a6ddb56379b08ec1bc233fd2a1b3c13d109
Author: Philippe Makowski <makowski.firebird-fr.eu.org>
Date: Mon Nov 28 21:43:37 2011 +0100
Better systemd support fix rh #757624
firebird.conf | 2 +-
firebird.spec | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/firebird.conf b/firebird.conf
index 9b59edc..fc6e407 100644
--- a/firebird.conf
+++ b/firebird.conf
@@ -1 +1 @@
-d /var/run/firebird 1777 root root -
+d /var/run/firebird 0775 firebird firebird -
diff --git a/firebird.spec b/firebird.spec
index f2c824f..f917ed7 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -6,7 +6,7 @@
Summary: SQL relational database management system
Name: firebird
Version: 2.5.1.26349.O
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Databases
License: Interbase
@@ -249,6 +249,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/system
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
mkdir -p %{buildroot}%{_var}/run/%{name}
+touch %{buildroot}%{_var}/run/%{name}/fb_guard
mkdir -p %{buildroot}%{fbroot}/plugins-superserver
mkdir -p %{buildroot}%{fbroot}/plugins-classic
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
@@ -323,6 +324,9 @@ ln -s %{fbroot}/bin/fb_config .%{_bindir}/fb_config
%clean
rm -Rf %{buildroot}
+%post
+/bin/systemd-tmpfiles %{_sysconfdir}/tmpfiles.d/firebird.conf
+
%post libfbclient -p /sbin/ldconfig
%postun libfbclient -p /sbin/ldconfig
@@ -344,6 +348,7 @@ fi
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /bin/systemctl enable firebird-classic.socket > /dev/null 2>&1 || :
fi
exit 0
@@ -381,6 +386,7 @@ fi
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /bin/systemctl enable firebird-superclassic.service > /dev/null 2>&1 || :
fi
%postun superclassic
@@ -399,6 +405,7 @@ fi
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /bin/systemctl enable firebird-superserver.service > /dev/null 2>&1 || :
fi
%postun superserver
@@ -472,6 +479,7 @@ fi
%{_sbindir}/fbguard
%{_sbindir}/fb_lock_print
%ghost %dir %attr(0775,%{name},%{name}) %{_var}/run/%{name}
+%ghost %attr(0644,%{name},%{name}) %{_var}/run/%{name}/fb_guard
%dir %{_sysconfdir}/tmpfiles.d
%{_sysconfdir}/tmpfiles.d/firebird.conf
@@ -551,6 +559,9 @@ fi
%changelog
+* Mon Nov 28 2011 Philippe Makowski <makowski at fedoraproject.org> 2.5.1.26349.O-3
+- Better systemd support fix rh #757624
+
* Sun Oct 02 2011 Karsten Hopp <karsten at redhat.com> 2.5.1.26349.O-2
- drop ppc64 configure script hack, not required anymore
More information about the scm-commits
mailing list