OpenPKG Specs: comparison bacula/bacula.spec

-:90922babfe99
+:fd2e00583bc4
 ##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 ##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ##  SUCH DAMAGE.
 ##
+# MSvB:
+# MSvB: Note, see http://www.bacula.org/en/?page=news
+# MSvB: for information on new configuration options.
+# MSvB: Warning! -L /pfx/lib is placed before locally
+# MSvB: built libraries (bacula-<ver>/src/cats...)
+# MSvB: which causes the old version of bacula to
+# MSvB: supply logic to the new version build!
+# MSvB:
 #   package information
 Name:         bacula
 Summary:      Network Backup Tool
 URL:          http://www.bacula.org/
 Vendor:       Kern Sibbald
 Distribution: OpenPKG Community
 Class:        PLUS
 Group:        System
 License:      GPL
 Version:      5.2.10
-Release:      20120629
+Release:      20120800
 #   package options
 %option       with_server       yes
 %option       with_ssl          yes
 %option       with_wrap         no
 Patch0:       bacula.patch
 #   build information
 BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc, gcc::with_cxx = yes
 PreReq:       OpenPKG, openpkg >= 20100101
-BuildPreReq:  readline, zlib
+BuildPreReq:  ncurses, readline, zlib
-PreReq:       readline, zlib
+PreReq:       ncurses, readline, zlib
 %if "%{with_ssl}" == "yes"
-BuildPreReq:  openssl >= 0.9.8
+BuildPreReq:  openssl >= 0.9.8, openssl::with_threads = yes
-PreReq:       openssl >= 0.9.8
+PreReq:       openssl >= 0.9.8, openssl::with_threads = yes
 %endif
 %if "%{with_wrap}" == "yes"
 BuildPreReq:  tcpwrappers
 PreReq:       tcpwrappers
 %endif
 %patch -p0
 rm -f src/lib/tcpd.h
 %build
 #   generate a random director password
-password="`openssl rand -base64 33`"
+#password=`tr -dc A-Za-z0-9 </dev/urandom | head -c 33`
+password=`%{l_openssl} rand -base64 33`
 #   for the same reason remove version informations from config files
 %{l_shtool} subst \
 -e "s;For Bacula release @VERSION@ .*;;" \
 `find . -name "*.conf.in"`
+#   help specific platforms find fdatasync(3)
+libs=""
+case "%{l_platform -t}" in
+*-sunos* ) libs="-lrt" ;;
+esac
 #   use localhost as default host
 %{l_shtool} subst \
 -e 's;hostname=.*;hostname=localhost;g' \
 configure
 #   configure
 LIBS=
 case "%{l_platform -t}" in
-*-linux*) LIBS="-L/usr/lib/termcap";;
+*-sunos*) LIBS="-ldl" ;;
 esac
 CC="%{l_cc}" \
 CFLAGS="%{l_cflags -O}" \
-CPPFLAGS="%{l_cppflags}" \
+CPPFLAGS="%{l_cppflags ncurses}" \
 LDFLAGS="%{l_ldflags} $LIBS" \
 ./configure \
 --prefix=%{l_prefix} \
 --with-dir-user=%{l_rusr} \
 --with-dir-group=%{l_rgrp} \
 --with-postgresql=%{l_prefix} \
 %endif
 %if "%{with_python}" == "yes" || "%{with_dvd}" == "yes"
 --with-python=%{l_prefix} \
 %endif
---enable-wx-console=no \
 --sysconfdir=%{l_prefix}/etc/bacula \
 --mandir=%{l_prefix}/man \
 --with-scriptdir=%{l_prefix}/libexec/bacula \
 --with-working-dir=%{l_prefix}/var/bacula \
 --with-pid-dir=%{l_prefix}/var/bacula/run \
 --with-subsys-dir=%{l_prefix}/var/bacula/run/subsys \
+--with-archivedir=/tmp \
+--with-sbin-perm=0755 \
+--disable-shared \
 --disable-nls
 #   build
 %{l_make} %{l_mflags -O}
 %install
 #   create installation hierarchy
 %{l_shtool} mkdir -f -p -m 755 \
 $RPM_BUILD_ROOT%{l_prefix}/bin \
 $RPM_BUILD_ROOT%{l_prefix}/sbin \
 $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula \
 #   install
 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 #   strip down installation
-#   do not strip binaries, to make it easier to diagnose problems
+strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true
-#   strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true
 ( cd $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula &&
 for unwanted in bconsole startmysql stopmysql; do
 rm -f $unwanted
 done
 ) || exit $?
 #   install additional files
 %{l_shtool} install -c -m 754 %{l_value -s -a} \
 %{SOURCE bexec.sh} $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula/bexec
-#   wrap binaries to avoid to specify "-c" for each run
+##   wrap binaries to avoid specifying '-c' on each run
-( cd $RPM_BUILD_ROOT%{l_prefix}/sbin
+#( cd $RPM_BUILD_ROOT%{l_prefix}/sbin
-for bin in bacula-dir bacula-fd bacula-sd \
+#  for bin in bacula-dir bacula-fd bacula-sd \
-bconsole bcopy bextract bls bscan dbcheck \
+#             bconsole bcopy bextract bls bscan dbcheck \
-tray-monitor wx-console; do
+#             tray-monitor wx-console; do
-if [ -x $bin ]; then
+#      if [ -x $bin ]; then
-mv $bin $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula
+#          mv $bin $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula
-ln $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula/bexec ./$bin
+#          ln $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula/bexec ./$bin
-fi
+#      fi
-done
+#  done
-) || exit $?
+#) || exit $?
-#   install run-command script
+#   install runcommand script
 %{l_shtool} install -c -m 755 %{l_value -s -a} \
 -e 's,@with_server@,%{with_server},g' \
 %{SOURCE rc.bacula} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 #   determine installation files
 '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/dvd-handler' \
 '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/mtx-changer' \
 %if "%{with_server}" == "yes"
 '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \
 '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup'\
-'%config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
+'%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
-'%config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
+'%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
 %endif
-'%config(noreplace) %{l_prefix}/etc/bacula/bacula-fd.conf' \
+'%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-fd.conf' \
-%if "%{with_server}" == "yes"
+'%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bconsole.conf' \
-'%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-dir.conf' \
+'%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/clients' \
-'%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-sd.conf' \
+'%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/scripts'
-%endif
-'%attr(640,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/bacula/bacula-fd.conf'
 %files -f files
 %clean
 %post
 #   create initial database
+%if "%{with_server}" == "yes"
 if [ ! -f $RPM_INSTALL_PREFIX/var/bacula/bacula.db ]; then
 $RPM_INSTALL_PREFIX/libexec/bacula/make_bacula_tables
 chmod 600 $RPM_INSTALL_PREFIX/var/bacula/bacula.db
 chown %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/bacula/bacula.db
 fi
+%endif
 #   after upgrade, restart service
 [ $1 -eq 2 ] || exit 0
 eval `%{l_rc} bacula status 2>/dev/null`
 [ ".$bacula_active" = .yes ] && %{l_rc} bacula restart

OpenPKG Specs / file comparison

comparison: bacula/bacula.spec

bacula/bacula.spec