[bacula/el5] Remove useless defines
Simone Caronni
slaanesh at fedoraproject.org
Wed Jul 18 13:04:24 UTC 2012
commit ea4848c7cd06d033c0d220835ad96cbad6c441a2
Author: Simone Caronni <negativo17 at gmail.com>
Date: Wed Jul 18 14:34:34 2012 +0200
Remove useless defines
bacula.spec | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 376827b..e70a278 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -1,11 +1,3 @@
-
-%define working_dir /var/spool/bacula
-%define script_dir /usr/libexec/bacula
-#%define rescue_version 2.0.0
-%define docs_version %{version}
-%define gui_version %{version}
-%define config_dir %{_sysconfdir}/bacula
-
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
Name: bacula
Version: 2.4.4
@@ -13,7 +5,7 @@ Release: 2%{?dist}
License: GPL
Group: System Environment/Daemons
Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
-Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.bz2
+Source1: http://download.sourceforge.net/bacula/bacula-docs-%{version}.tar.bz2
Source3: bacula-gconsole.desktop
Source4: bacula-wxconsole.desktop
Source5: bacula-traymonitor.desktop
@@ -336,8 +328,8 @@ cp -rl ../bacula-%{version}/* .
--with-mon-dir-password=@@MON_DIR_PASSWORD@@ \
--with-mon-fd-password=@@MON_FD_PASSWORD@@ \
--with-mon-sd-password=@@MON_SD_PASSWORD@@ \
- --with-working-dir=%{working_dir} \
- --with-scriptdir=%{script_dir} \
+ --with-working-dir=%{_localstatedir}/spool/bacula \
+ --with-scriptdir=%{_libexecdir}/bacula \
--with-smtp-host=localhost \
--with-subsys-dir=%{_localstatedir}/lock/subsys \
--with-pid-dir=%{_localstatedir}/run \
@@ -403,7 +395,7 @@ pushd bacula-postgresql
popd
# Build the docs
-pushd bacula-docs-%{docs_version}
+pushd bacula-docs-%{version}
%configure --with-bacula=%{_builddir}/bacula-%{version}/bacula-%{version}
make
popd
@@ -1037,17 +1029,19 @@ fi
%files docs
-%doc bacula-docs-%{docs_version}/bacula-web/bacula-web.pdf
-%doc bacula-docs-%{docs_version}/bacula-web/bacula-web/
-%doc bacula-docs-%{docs_version}/developers/developers.pdf
-%doc bacula-docs-%{docs_version}/developers/developers/
-%doc bacula-docs-%{docs_version}/manual/bacula.pdf
-%doc bacula-docs-%{docs_version}/manual/bacula/
+%doc bacula-docs-%{version}/bacula-web/bacula-web.pdf
+%doc bacula-docs-%{version}/bacula-web/bacula-web/
+%doc bacula-docs-%{version}/developers/developers.pdf
+%doc bacula-docs-%{version}/developers/developers/
+%doc bacula-docs-%{version}/manual/bacula.pdf
+%doc bacula-docs-%{version}/manual/bacula/
%changelog
* Wed Jul 18 2012 Simone Caronni <negativo17 at gmail.com> 2.4.4-3
- Removed commented stuff that will never come back.
+- Cleaned up init files.
+- Get rid of useless defines.
* Sun Feb 28 2010 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 2.4.4-2
- Implement workaround for broken alternatives in 2.0.3-10
More information about the scm-commits
mailing list