Tweak bacula.spec.in and fix bat install to use DESTDIR

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8874 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index e5dfa58b6019d58458e449f3e40f86ae7194ccb3..9b3ee9723cfcdfcd9d215b7f54df0dd204023691 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -1442,7 +1442,7 @@ make sqlite3
 make mtx
 %endif
 %if %{bat}
-make qwt
+#make qwt
 %endif
 cd ${cwd}
 
@@ -1516,16 +1516,17 @@ export QTLIB=/usr/lib64/qt4/
 %configure \
         --prefix=%{_prefix} \
         --sbindir=%{_sbindir} \
-       --sysconfdir=%{sysconf_dir} \
-       --with-scriptdir=%{script_dir} \
-       --with-working-dir=%{working_dir} \
-       --with-pid-dir=%{pid_dir} \
+        --sysconfdir=%{sysconf_dir} \
+        --with-scriptdir=%{script_dir} \
+        --with-working-dir=%{working_dir} \
+        --with-pid-dir=%{pid_dir} \
         --enable-smartalloc \
         --enable-client-only \
-       %if %{mdk}
-       --disable-nls \
-       %endif
-        --enable-static-fd
+        %if %{mdk}
+        --disable-nls \
+        %endif
+        --enable-static-fd \
+        --disable-libtool
 
 make
 %endif
@@ -1533,10 +1534,10 @@ make
 %configure \
         --prefix=%{_prefix} \
         --sbindir=%{_sbindir} \
-       --sysconfdir=%{sysconf_dir} \
-       --with-scriptdir=%{script_dir} \
-       --with-working-dir=%{working_dir} \
-       --with-pid-dir=%{pid_dir} \
+        --sysconfdir=%{sysconf_dir} \
+        --with-scriptdir=%{script_dir} \
+        --with-working-dir=%{working_dir} \
+        --with-pid-dir=%{pid_dir} \
         --enable-smartalloc \
 %if %{gconsole}
         --enable-gnome \
@@ -1554,23 +1555,23 @@ make
         --with-postgresql \
 %endif
 %if %{wxconsole}
-       --enable-bwx-console \
+        --enable-bwx-console \
 %endif
 %if %{bat}
-       --enable-bat \
-       --with-qwt=${cwd}/%{depkgs}/qwt \
+        --enable-bat \
+        --without-qwt \
 %endif
 %if %{python}
-       --with-python \
+        --with-python \
 %endif
 %if %{client_only}
-       --enable-client-only \
+        --enable-client-only \
 %endif
 %if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3} 
-       --disable-batch-insert \
+        --disable-batch-insert \
 %endif
-       --mandir=%{_mandir} \
-       --with-plugindir=%{script_dir} \
+        --mandir=%{_mandir} \
+        --with-plugindir=%{script_dir} \
         --with-subsys-dir=%{_subsysdir} \
         --with-dir-user=%{director_daemon_user} \
         --with-dir-group=%{daemon_group} \
@@ -1627,10 +1628,10 @@ cd %{depkgs}
 make \
         prefix=$RPM_BUILD_ROOT%{_prefix} \
         sbindir=$RPM_BUILD_ROOT%{_sbindir} \
-       sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \
-       scriptdir=$RPM_BUILD_ROOT%{script_dir} \
+        sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \
+        scriptdir=$RPM_BUILD_ROOT%{script_dir} \
         working_dir=$RPM_BUILD_ROOT%{working_dir} \
-       piddir=$RPM_BUILD_ROOT%{pid_dir} \
+        piddir=$RPM_BUILD_ROOT%{pid_dir} \
         mandir=$RPM_BUILD_ROOT%{_mandir} \
         mtx-install
 cd ${cwd}
@@ -1803,7 +1804,7 @@ cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_i
 cp -p scripts/bat.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
 cp -p scripts/bat.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bat
 cp -p scripts/bat.pamd $RPM_BUILD_ROOT/etc/pam.d/bat
-ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bat
+ln -sf consolehelper $RPM_BUILD_ROOT/%{_sbindir}/bat
 %endif
 
 # install sqlite
@@ -2056,24 +2057,24 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1`
 # are we upgrading from sqlite to sqlite3?
 if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite ];then
         echo "This version of bacula-sqlite involves an upgrade to sqlite3."
-       echo "Your catalog database file is not compatible with sqlite3, thus"
-       echo "you will need to dump the data, delete the old file, and re-run"
-       echo "this rpm upgrade."
-       echo ""
-       echo "Backing up your current database..."
+        echo "Your catalog database file is not compatible with sqlite3, thus"
+        echo "you will need to dump the data, delete the old file, and re-run"
+        echo "this rpm upgrade."
+        echo ""
+        echo "Backing up your current database..."
         echo ".dump" | %{sqlite_bindir}/sqlite %{working_dir}/bacula.db > %{working_dir}/bacula_backup.sql
-       mv %{working_dir}/bacula.db %{working_dir}/bacula.db.old
-       echo "Your catalog data has been saved in %{working_dir}/bacula_backup.sql and your"
-       echo "catalog file has been renamed %{working_dir}/bacula.db.old."
-       echo ""
-       echo "Please re-run this rpm package upgrade."
-       echo "After the upgrade is complete, restore your catalog"
-       echo "with the following commands:"
-       echo "%{script_dir}/drop_sqlite3_tables"
-       echo "cd %{working_dir}"
-       echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql"
-       echo "chown bacula.bacula bacula.db"
-       exit 1
+        mv %{working_dir}/bacula.db %{working_dir}/bacula.db.old
+        echo "Your catalog data has been saved in %{working_dir}/bacula_backup.sql and your"
+        echo "catalog file has been renamed %{working_dir}/bacula.db.old."
+        echo ""
+        echo "Please re-run this rpm package upgrade."
+        echo "After the upgrade is complete, restore your catalog"
+        echo "with the following commands:"
+        echo "%{script_dir}/drop_sqlite3_tables"
+        echo "cd %{working_dir}"
+        echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql"
+        echo "chown bacula.bacula bacula.db"
+        exit 1
 fi
 # test for bacula database older than version 10 and sqlite3
 if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite3 ];then
@@ -2090,7 +2091,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "10" ]; then
         echo "This bacula upgrade will update a bacula database from version 10 to 11."
         echo "You appear to be running database version $DB_VER. You must first update"
         echo "your database to version 10 and then install this upgrade. The alternative"
-       echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current"
+        echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current"
         echo "catalog information, then do the upgrade. Information on updating a"
         echo "database older than version 10 can be found in the release notes."
         exit 1
@@ -2104,7 +2105,7 @@ fi
 %if ! %{client_only}
 # check for and copy %{sysconf_dir}/console.conf to bconsole.conf
 if [ -s %{sysconf_dir}/console.conf ];then
-       cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf
+        cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf
 fi
 
 # create the daemon users and groups
@@ -2186,11 +2187,11 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1`
 if [ -z "$DB_VER" ]; then
         echo "Hmm, doesn't look like you have an existing database."
         echo "Granting privileges for MySQL user bacula..."
-       %{script_dir}/grant_mysql_privileges
+        %{script_dir}/grant_mysql_privileges
         echo "Creating MySQL bacula database..."
-       %{script_dir}/create_mysql_database
+        %{script_dir}/create_mysql_database
         echo "Creating bacula tables..."
-       %{script_dir}/make_mysql_tables
+        %{script_dir}/make_mysql_tables
 
 # check to see if we need to upgrade a 2.x database
 elif [ "$DB_VER" -lt "11" ]; then
@@ -2198,7 +2199,7 @@ elif [ "$DB_VER" -lt "11" ]; then
         echo "Backing up your current database..."
         mysqldump -f --opt bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2
         echo "Upgrading bacula database ..."
-       %{script_dir}/update_mysql_tables
+        %{script_dir}/update_mysql_tables
         echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2"
 
 fi
@@ -2214,17 +2215,17 @@ if [ -s %{working_dir}/bacula.db ]; then
                 echo "Backing up your current database..."
                 echo ".dump" | %{sqlite_bindir}/sqlite3 %{working_dir}/bacula.db | bzip2 > %{working_dir}/bacula_backup.sql.bz2
                 echo "Upgrading bacula database ..."
-               %{script_dir}/update_sqlite3_tables
+                %{script_dir}/update_sqlite3_tables
                 echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2"
         fi
 else
         # create the database and tables
         echo "Hmm, doesn't look like you have an existing database."
         echo "Creating SQLite database..."
-       %{script_dir}/create_sqlite3_database
-       chown %{director_daemon_user}.%{daemon_group} %{working_dir}/bacula.db
+        %{script_dir}/create_sqlite3_database
+        chown %{director_daemon_user}.%{daemon_group} %{working_dir}/bacula.db
         echo "Creating the SQLite tables..."
-       %{script_dir}/make_sqlite3_tables
+        %{script_dir}/make_sqlite3_tables
 fi
 %endif
 
@@ -2237,11 +2238,11 @@ DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head
 if [ -z "$DB_VER" ]; then
         echo "Hmm, doesn't look like you have an existing database."
         echo "Creating PostgreSQL bacula database..."
-       %{script_dir}/create_postgresql_database
+        %{script_dir}/create_postgresql_database
         echo "Creating bacula tables..."
-       %{script_dir}/make_postgresql_tables
+        %{script_dir}/make_postgresql_tables
         echo "Granting privileges for PostgreSQL user bacula..."
-       %{script_dir}/grant_postgresql_privileges
+        %{script_dir}/grant_postgresql_privileges
 
 # check to see if we need to upgrade a 2.x database
 elif [ "$DB_VER" -lt "11" ]; then
@@ -2249,7 +2250,7 @@ elif [ "$DB_VER" -lt "11" ]; then
         echo "Backing up your current database..."
         pg_dump bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2
         echo "Upgrading bacula database ..."
-       %{script_dir}/update_postgresql_tables
+        %{script_dir}/update_postgresql_tables
         echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2"
         
 fi
@@ -2258,7 +2259,7 @@ fi
 %if ! %{client_only}
 # generate passwords if needed
 if [ -d %{sysconf_dir} ]; then
-       cd %{sysconf_dir}
+        cd %{sysconf_dir}
         for file in *.conf; do
                 for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do
                         need_password=`grep $string $file 2>/dev/null`
@@ -2396,7 +2397,7 @@ fi
 
 # generate passwords if needed
 if [ -d %{sysconf_dir} ]; then
-       cd %{sysconf_dir}
+        cd %{sysconf_dir}
         for file in *.conf; do
                 for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do
                         need_password=`grep $string $file 2>/dev/null`
@@ -2478,7 +2479,7 @@ fi
 %post gconsole
 # generate passwords if needed
 if [ -d %{sysconf_dir} ]; then
-       cd %{sysconf_dir}
+        cd %{sysconf_dir}
         for file in *.conf; do
                 for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do
                         need_password=`grep $string $file 2>/dev/null`
@@ -2523,7 +2524,7 @@ fi
 %post wxconsole
 # generate passwords if needed
 if [ -d %{sysconf_dir} ]; then
-       cd %{sysconf_dir}
+        cd %{sysconf_dir}
         for file in *.conf; do
                 for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do
                         need_password=`grep $string $file 2>/dev/null`
@@ -2552,7 +2553,7 @@ fi
 # add the console helper files
 %config(noreplace,missingok) /etc/pam.d/bat
 %config(noreplace,missingok) /etc/security/console.apps/bat
-/usr/bin/bat
+%{_sbindir}/bat
 %endif
 
 %if %{bat}
@@ -2568,7 +2569,7 @@ fi
 %post bat
 # generate passwords if needed
 if [ -d %{sysconf_dir} ]; then
-       cd %{sysconf_dir}
+        cd %{sysconf_dir}
         for file in *.conf; do
                 for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do
                         need_password=`grep $string $file 2>/dev/null`

diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index 89f76ea79b6030211c49122aa5aa764833b5bf3a..222d56ba1b0c09f4d4534c003a36d8cc12a51732 100644 (file)
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -12,7 +12,7 @@ CONFIG += qt debug @QWT@
 bins.path = /$(DESTDIR)@sbindir@
 bins.files = bat
 confs.path = /$(DESTDIR)@sysconfdir@
-confs.commands = ./install_conf_file   
+confs.commands = DESTDIR="${DESTDIR}" ./install_conf_file   
 help.path = /$(DESTDIR)@htmldir@
 help.files = help/*.html images/status.png images/mail-message-new.png