rpms/bacula
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove user definition during prep so they are not used during the install phase (rhbz#852732) and enforce permissions in default config files (just in case...)

Browse Source
This commit is contained in:
Simone Caronni 2012-08-29 17:52:55 +02:00
parent f46ff02c16
commit 07887b2feb
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bacula.spec
View File

@ -3,7 +3,7 @@
Name: bacula Name: bacula
Version: 5.2.10 Version: 5.2.10
Release: 5%{?dist} Release: 6%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details # See LICENSE for details
License: AGPLv3 with exceptions License: AGPLv3 with exceptions
@ -303,12 +303,6 @@ export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses" export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
%configure \ %configure \
--sysconfdir=%{_sysconfdir}/bacula \ --sysconfdir=%{_sysconfdir}/bacula \
--with-dir-user=bacula \
--with-dir-group=bacula \
--with-sd-user=bacula \
--with-sd-group=disk \
--with-fd-user=root \
--with-fd-group=root \
--with-hostname=localhost \ --with-hostname=localhost \
--with-basename=bacula \ --with-basename=bacula \
--with-dir-password=@@DIR_PASSWORD@@ \ --with-dir-password=@@DIR_PASSWORD@@ \
@ -381,7 +375,7 @@ rm -f %{buildroot}%{_libdir}/libbaccats.so
rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
# Sample query file # Sample query file
install -p -m 640 -D examples/sample-query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql mv %{buildroot}%{_libexecdir}/bacula/query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
# Bat # Bat
@ -769,7 +763,7 @@ fi
%{_sbindir}/bls %{_sbindir}/bls
%{_sbindir}/bscan %{_sbindir}/bscan
%{_sbindir}/btape %{_sbindir}/btape
%config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd %config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 %if 0%{?fedora} >= 15 || 0%{?rhel} > 6
%{_unitdir}/bacula-sd.service %{_unitdir}/bacula-sd.service
@ -795,7 +789,7 @@ fi
%else %else
%{_initrddir}/bacula-fd %{_initrddir}/bacula-fd
%endif %endif
%config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
%{_mandir}/man8/bacula-fd.8.* %{_mandir}/man8/bacula-fd.8.*
%{_libdir}/bacula/bpipe-fd.so %{_libdir}/bacula/bpipe-fd.so
@ -843,6 +837,11 @@ fi
%changelog %changelog
* Wed Aug 29 2012 Simone Caronni <negativo17@gmail.com> - 5.2.10-6
- Remove user definition during prep so they are not used during the install
phase (rhbz#852732).
- Enforce permissions in default config files.
* Fri Jul 20 2012 Simone Caronni <negativo17@gmail.com> - 5.2.10-5 * Fri Jul 20 2012 Simone Caronni <negativo17@gmail.com> - 5.2.10-5
- Removed make_catalog_backup bash script, leave only the default perl one (rhbz#456612,665498). - Removed make_catalog_backup bash script, leave only the default perl one (rhbz#456612,665498).