From: D. S. B. <fle...@us...> - 2010-02-25 20:03:03
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Bacula". The branch, master has been updated via ab5ce5439c206fcc623ef840804698d79ef5c525 (commit) via 04e8340d0249ec3e5a1d8270e19f15cc1d8b414c (commit) via 15417688eda088b67d79b26d38662e6b6931d204 (commit) from 74b92257b6a46e3d27fd692151948de8317e3d5e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ab5ce5439c206fcc623ef840804698d79ef5c525 Author: Scott Barninger <sbarn@scott.localdomain> Date: Thu Feb 25 15:01:49 2010 -0500 Fix typo. commit 04e8340d0249ec3e5a1d8270e19f15cc1d8b414c Merge: 15417688eda088b67d79b26d38662e6b6931d204 74b92257b6a46e3d27fd692151948de8317e3d5e Author: Scott Barninger <sbarn@scott.localdomain> Date: Thu Feb 25 14:44:18 2010 -0500 Merge branch 'master' of ssh://fle...@ba.../gitroot/bacula/bacula commit 15417688eda088b67d79b26d38662e6b6931d204 Author: Scott Barninger <sbarn@scott.localdomain> Date: Thu Feb 25 14:42:20 2010 -0500 Fix typo in sysconf_dir. ----------------------------------------------------------------------- Summary of changes: diff --git a/bacula/platforms/rpm/bacula-bat.spec b/bacula/platforms/rpm/bacula-bat.spec index 907d25d..bb88310 100644 --- a/bacula/platforms/rpm/bacula-bat.spec +++ b/bacula/platforms/rpm/bacula-bat.spec @@ -221,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc/bacula %if %{suse} cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_icon.png cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop -touch RPM_BUILD_ROOT%{sysconfdir}/bat.kdesu +touch $RPM_BUILD_ROOT%{sysconf_dir}/bat.kdesu %else cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_icon.png cp -p scripts/bat.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/bat.desktop hooks/post-receive -- Bacula |