From: Kern Sibbald Date: Sun, 2 Aug 2009 10:48:34 +0000 (+0200) Subject: Move bat from bacula.spec to bacula-bat.spec X-Git-Tag: Release-5.0.0~386^2~9 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=19f8d60a587b978c63ab2fedbe63cf781da90cc1;p=bacula%2Fbacula Move bat from bacula.spec to bacula-bat.spec --- diff --git a/bacula/platforms/redhat/bacula.spec b/bacula/platforms/redhat/bacula.spec index e7e816e6a2..7c5627420c 100644 --- a/bacula/platforms/redhat/bacula.spec +++ b/bacula/platforms/redhat/bacula.spec @@ -7,9 +7,6 @@ # basic defines for every build %define _release 1 %define _version 3.0.2 -%define docs_version 3.0.2 -%define depkgs_version 18Feb09 -%define depkgs_qt_version 28Jul09 %define _packager D. Scott Barninger %define single_dir 0 @@ -226,10 +223,7 @@ Prefix: %{_prefix} Source0: http://www.prdownloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz Source1: Release_Notes-%{version}-%{release}.tar.gz -Source2: http://www.prdownloads.sourceforge.net/bacula/%{name}-docs-%{docs_version}.tar.gz -Source3: http://www.prdownloads.sourceforge.net/bacula/depkgs-%{depkgs_version}.tar.gz -Source4: http://www.prdownloads.sourceforge.net/bacula/depkgs-qt-%{depkgs_qt_version}.tar.gz -Source5: bacula-2.2.7-postgresql.patch +Source2: bacula-2.2.7-postgresql.patch # define the basic package description %define blurb Bacula - It comes by night and sucks the vital essence from your computers. @@ -241,11 +235,6 @@ Source5: bacula-2.2.7-postgresql.patch %define blurb7 features that make it easy to find and recover lost or damaged files. %define blurb8 Bacula source code has been released under the GPL version 2 license. -# Source directory locations -%define _docsrc ../%{name}-docs-%{docs_version} -%define depkgs ../depkgs -%define depkgs_qt ../depkgs-qt - %define user_file /etc/passwd %define group_file /etc/group @@ -428,11 +417,6 @@ exit 1 %{?DISTNAME:%define _dist %{DISTNAME}} Distribution: %{_dist} -# Should we build bat -# requires >= Qt-4.2 -%define bat 0 -%{?build_bat:%define bat 1} - # should we turn on python support %define python 0 %{?build_python:%define python 1} @@ -696,46 +680,6 @@ Group: System Environment/Daemons This package installs the Bacula pdf and html documentation. -%if %{bat} -%package bat -Summary: Bacula - The Network Backup Solution -Group: System Environment/Daemons - -%if %{suse} -Requires: openssl -Requires: glibc -Requires: fontconfig -Requires: freetype2 -Requires: libgcc -Requires: libpng -Requires: libstdc++ -Requires: zlib -%else -Requires: openssl -Requires: glibc -Requires: fontconfig -Requires: freetype -Requires: libgcc -Requires: libpng -Requires: libstdc++ -Requires: zlib -%endif - -%description bat -%{blurb} - -%{blurb2} -%{blurb3} -%{blurb4} -%{blurb5} -%{blurb6} -%{blurb7} -%{blurb8} - -This is the Bacula Administration Tool (bat) graphical user interface package. -It is an add-on to the client or server packages. -%endif - # Must explicitly enable debug pkg on SuSE %if %{suse} %debug_package @@ -743,34 +687,12 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib/termcap" %endif %prep - %setup %setup -T -D -b 1 %setup -T -D -b 2 -%setup -T -D -b 3 -%setup -T -D -b 4 -%setup -T -D -b 5 %build -cwd=${PWD} -%if %{bat} -#export QTDIR=$(pkg-config --variable=prefix QtCore) -#export QTINC=$(pkg-config --variable=includedir QtCore) -#export QTLIB=$(pkg-config --variable=libdir QtCore) -#export PATH=${QTDIR}/bin/:${PATH} -cd %{depkgs_qt} -make qt4 </dev/null` -if [ -z "$HAVE_BACULA" ]; then - %{groupadd} -r %{daemon_group} > /dev/null 2>&1 - echo "The group %{daemon_group} has been added to %{group_file}." - echo "See the manual chapter \"Running Bacula\" for details." -fi - -%post bat -if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} - 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 - pass=`openssl rand -base64 33` - for file in *.conf; do - need_password=`grep ${string} $file 2>/dev/null` - if [ -n "$need_password" ]; then - sed "s@${string}@${pass}@g" $file > $file.new - cp -f $file.new $file; rm -f $file.new - fi - done - done -# put actual hostname in conf file - host=`hostname` - string="XXX_HOSTNAME_XXX" - for file in *.conf; do - need_host=`grep ${string} $file 2>/dev/null` - if [ -n "$need_host" ]; then - sed "s@${string}@${host}@g" $file >$file.new - cp -f $file.new $file; rm -f $file.new - fi - done -fi - -%endif - %changelog * Sat Jun 20 2009 D. Scott Barninger - Fix bat install which is now handled by make and uses shared libs diff --git a/bacula/technotes b/bacula/technotes index 1ebe74dc0c..dde7453a9d 100644 --- a/bacula/technotes +++ b/bacula/technotes @@ -3,6 +3,7 @@ General: 02Aug09 +kes Move bat from bacula.spec to bacula-bat.spec kes Remove installing gconsole start script from Makefile.in 01Aug09 ebl Add Job Info panel to bat