[pads] Drop prelude support
Steve Grubb
sgrubb at fedoraproject.org
Fri Jun 21 19:51:36 UTC 2013
commit cdf19c2768012af5119aa90a6528a69c1978c660
Author: Steve <sgrubb at redhat.com>
Date: Fri Jun 21 15:51:11 2013 -0400
Drop prelude support
pads.spec | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/pads.spec b/pads.spec
index e4b0688..a646ec4 100644
--- a/pads.spec
+++ b/pads.spec
@@ -30,10 +30,7 @@ Patch18: pads-aarch64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake autoconf
BuildRequires: pcre-devel libpcap-devel
-#Requires(post) : /sbin/chkconfig
-#Requires(preun) : /sbin/chkconfig
-#Requires(preun) : /sbin/service
-#Requires(postun): /sbin/service
+BuildRequires: systemd
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -74,7 +71,7 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{_unitdir}
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
make install DESTDIR=%{buildroot}
-install -m 755 %SOURCE1 %{buildroot}%{_unitdir}/%{name}.service
+install -m 644 %SOURCE1 %{buildroot}%{_unitdir}/pads.service
install -m 640 %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/%{name}
# Remove installed docs since we pick this up another way
rm -rf $RPM_BUILD_ROOT/usr/share/pads/
@@ -83,7 +80,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/
rm -rf %{buildroot}
%post
-#/sbin/chkconfig --add %{name}
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -91,10 +87,6 @@ fi
%preun
-#if [ $1 = 0 ]; then
-# /sbin/service %{name} stop > /dev/null 2>&1 || :
-# /sbin/chkconfig --del %{name}
-#fi
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload pads.service > /dev/null 2>&1 || :
@@ -103,9 +95,6 @@ fi
%postun
-#if [ "$1" -ge "1" ]; then
-# /sbin/service %{name} condrestart >/dev/null 2>&1 || :
-#fi
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
@@ -130,7 +119,7 @@ fi
%{_sysconfdir}/pads-signature-list
%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/pads.conf
%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/sysconfig/%{name}
-%attr(0755,root,root) %{_unitdir}/%{name}.service
+%{_unitdir}/pads.service
%{_bindir}/pads
%{_bindir}/pads-report
%{_mandir}/*/*
More information about the scm-commits
mailing list