[BackupPC] add support for tmpfiles.d & minor cleanup
Bernard Johnson
bjohnson at fedoraproject.org
Sat Jul 9 05:34:26 UTC 2011
commit e66c69aaf26df147167e1d7230b0290c57c6a49c
Author: Bernard Johnson <bjohnson at symetrix.com>
Date: Fri Jul 8 23:15:38 2011 -0600
add support for tmpfiles.d & minor cleanup
BackupPC.spec | 19 +++++++++----------
BackupPC.tmpfiles | 1 +
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/BackupPC.spec b/BackupPC.spec
index 3e24741..477a850 100644
--- a/BackupPC.spec
+++ b/BackupPC.spec
@@ -1,4 +1,4 @@
-%if 0%{?rhel} && 0%{?rhel} < 5
+
%define _without_selinux 1
%endif
@@ -24,6 +24,7 @@ Source3: BackupPC-README.fedora
#A C wrapper to use since perl-suidperl is no longer provided
Source4: BackupPC_Admin.c
Source5: backuppc.service
+Source6: BackupPC.tmpfiles
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,12 +42,6 @@ BuildRequires: systemd-units
# Unbundled libraries
Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle)
-# Unbundled libraries
-Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle)
-
-# Unbundled libraries
-Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle)
-
Requires: httpd
Requires: perl(File::RsyncP), perl(Compress::Zlib), perl(Archive::Zip)
Requires: perl-Time-modules, perl(XML::RSS)
@@ -172,17 +167,19 @@ sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc
%if 0%{?_with_systemd}
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d
%else
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
%endif
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
%if 0%{?_with_systemd}
cp -a %{SOURCE5} %{buildroot}/%{_unitdir}/
+cp -a %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/backuppc
%else
cp -a init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc
%endif
@@ -288,7 +285,6 @@ fi
%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name}
%dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/
-%dir %attr(-,backuppc,backuppc) %{_localstatedir}/run/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/*
@@ -299,9 +295,11 @@ fi
%{_datadir}/%{name}/[^s]*
%if 0%{?_with_systemd}
-%attr(0644,root,root) %{_unitdir}/backuppc.service
+%{_unitdir}/backuppc.service
+%{_sysconfdir}/tmpfiles.d/backuppc
%else
%attr(0755,root,root) %{_initrddir}/backuppc
+%dir %attr(0775,backuppc,backuppc) %{_localstatedir}/run/%{name}
%endif
%attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin
@@ -329,6 +327,7 @@ fi
- patch to move pid dir under /var/run
- minor spec cleanup
- unbundle Net::FTP::*
+- add support for tmpfiles.d
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/BackupPC.tmpfiles b/BackupPC.tmpfiles
new file mode 100644
index 0000000..9d940cc
--- /dev/null
+++ b/BackupPC.tmpfiles
@@ -0,0 +1 @@
+D /var/run/BackupPC backukppc backuppc 775 -
More information about the scm-commits
mailing list