From 48e483a64c307e25b2d121d1bf95805baf3989af Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sat, 2 Sep 2006 13:15:40 +0000 Subject: [PATCH] 1.39.22 remove separate install of manpages. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3400 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/platforms/mandrake/bacula.spec.in | 11 ++++------- bacula/platforms/redhat/bacula.spec.in | 11 ++++------- bacula/platforms/suse/bacula.spec.in | 11 ++++------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index f1bd685ed1..dc33cc24dd 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -958,13 +958,6 @@ make \ mandir=$RPM_BUILD_ROOT%{_mandir} \ install -cd manpages -make \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - install -cd ${cwd} - - %if ! %{client_only} cd %{depkgs} make \ @@ -1274,6 +1267,7 @@ if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite ];then DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head -1` %endif +%if ! %{client_only} if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "This bacula upgrade will update a bacula database from version 9 to 10." echo "You appear to be running database version $DB_VER. You must first update" @@ -1283,6 +1277,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "database older than version 9 can be found in the release notes." exit 1 fi +%endif %if %{sqlite} fi @@ -1688,6 +1683,8 @@ fi %endif %changelog +* Sat Sep 02 2006 D. Scott Barninger +- 1.39.22 remove separate cd and make of manpages the main Makefile does it now * Sun Aug 06 2006 D. Scott Barninger - fix manpages file extension for mdk * Sat Aug 05 2006 D. Scott Barninger diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index f1bd685ed1..dc33cc24dd 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -958,13 +958,6 @@ make \ mandir=$RPM_BUILD_ROOT%{_mandir} \ install -cd manpages -make \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - install -cd ${cwd} - - %if ! %{client_only} cd %{depkgs} make \ @@ -1274,6 +1267,7 @@ if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite ];then DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head -1` %endif +%if ! %{client_only} if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "This bacula upgrade will update a bacula database from version 9 to 10." echo "You appear to be running database version $DB_VER. You must first update" @@ -1283,6 +1277,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "database older than version 9 can be found in the release notes." exit 1 fi +%endif %if %{sqlite} fi @@ -1688,6 +1683,8 @@ fi %endif %changelog +* Sat Sep 02 2006 D. Scott Barninger +- 1.39.22 remove separate cd and make of manpages the main Makefile does it now * Sun Aug 06 2006 D. Scott Barninger - fix manpages file extension for mdk * Sat Aug 05 2006 D. Scott Barninger diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index f1bd685ed1..dc33cc24dd 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -958,13 +958,6 @@ make \ mandir=$RPM_BUILD_ROOT%{_mandir} \ install -cd manpages -make \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - install -cd ${cwd} - - %if ! %{client_only} cd %{depkgs} make \ @@ -1274,6 +1267,7 @@ if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite ];then DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head -1` %endif +%if ! %{client_only} if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "This bacula upgrade will update a bacula database from version 9 to 10." echo "You appear to be running database version $DB_VER. You must first update" @@ -1283,6 +1277,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "database older than version 9 can be found in the release notes." exit 1 fi +%endif %if %{sqlite} fi @@ -1688,6 +1683,8 @@ fi %endif %changelog +* Sat Sep 02 2006 D. Scott Barninger +- 1.39.22 remove separate cd and make of manpages the main Makefile does it now * Sun Aug 06 2006 D. Scott Barninger - fix manpages file extension for mdk * Sat Aug 05 2006 D. Scott Barninger -- 2.39.5