X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fplatforms%2Fredhat%2Fbacula.spec.in;h=4e67593ca1480d1120e83a87c1e6b3f5b3185649;hb=4d06a55913c582458dcfad1642e1ee2cb091b1bf;hp=9764ddc218ef6d8b0966ef8400ed3fbe28585eaf;hpb=c8f6dcd4b37b6874b2fb150fc2efd4b0e72dedb5;p=bacula%2Fbacula diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index 9764ddc218..4e67593ca1 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -6,14 +6,13 @@ # basic defines for every build %define _version @VERSION@ %define _release 1 -%define depkgs_version 11Jul07 +%define depkgs_version 09Sep07 %define _rescuever @VERSION@ %define docs_version @VERSION@ # any patches for this release # be sure to check the setup section for patch macros - #-------------------------------------------------------------------------- # it should not be necessary to change anything below here for a release # except for patch macros in the setup section @@ -196,10 +195,10 @@ exit 1 %{?build_x86_64:%define x86_64 1} # check what distribution we are -%if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} || %rhel5} +%if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} || %{rhel5} %define _dist %(grep Red /etc/redhat-release) %endif -%if %{fc1} || %{fc4} || %{fc5} || %{fc6} || %{fc7} +%if %{fc1} || %{fc4} || %{fc5} || %{fc7} %define _dist %(grep Fedora /etc/redhat-release) %endif %if %{centos5} || %{centos4} || %{centos3} @@ -211,6 +210,9 @@ exit 1 %if %{fc3} && ! %{rhel4} && ! %{centos4} && ! %{sl4} %define _dist %(grep Fedora /etc/redhat-release) %endif +%if %{fc6} && ! %{rhel5} && ! %{centos5} && ! %{sl5} +%define _dist %(grep Fedora /etc/redhat-release) +%endif %if %{wb3} && ! %{rhel3} && ! %{centos3} && ! %{sl3} %define _dist %(grep White /etc/whitebox-release) %endif @@ -224,10 +226,11 @@ Distribution: %{_dist} # Should we build gconsole, possible only if gtk= >= 2.4 available. # leaving all the BuildRequires and Requires in place below for now. -# su10 and fc4 now nobuild, tray monitor fails to build as of 2.2.1 release +# su10, fc3 and fc4 now nobuild, tray monitor fails to build as of 2.2.1 +# release as it needs 2.10 %define gconsole 1 -%if %{rh7} || %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc4} || %{su9} || %{su10} +%if %{rh7} || %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{su9} || %{su10} %define gconsole 0 %endif %if %{mdk} && ! %{mdv} @@ -283,9 +286,20 @@ BuildRequires: python, python-devel %if %{gconsole} BuildRequires: pkgconfig, pango-devel, atk-devel %endif -%if %{bat} + +# Rh qt4 packages don't provide, guess what, qt! +# so fix for broken rh +%define broken_rh 0 +%if %{rhel5} || %{centos5} || %{sl5} || %{fc5} || %{fc6} || %{fc7} +%define broken_rh 1" +%endif +%if %{bat} && ! %{broken_rh} BuildRequires: qt-devel >= 4.2 %endif +%if %{bat} && %{broken_rh} +BuildRequires: qt4-devel >= 4.2 +%endif + %if %{rh7} BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.2 @@ -992,7 +1006,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -1004,7 +1018,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -1016,7 +1030,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -1103,6 +1117,18 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/mysql" export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}" %endif +# Red Hat's 64 bit installation of QT4 appears to be broken so: +%define qt_path 0 +%if %{rhel5} || %{centos5} || %{sl5} +%define qt_path 1 +%endif +%if %{bat} && %{qt_path} && %{x86_64} +export PATH=/usr/lib64/qt4/bin/:$PATH +export QTDIR=/usr/lib64/qt4/ +export QTINC=/usr/lib64/qt4/include/ +export QTLIB=/usr/lib64/qt4/ +%endif + %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ @@ -1154,9 +1180,9 @@ make %endif %if %{client_only} --enable-client-only \ +%endif %if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3} --disable-batch-insert \ -%endif %endif --mandir=%{_mandir} \ --with-subsys-dir=/var/lock/subsys \ @@ -1696,6 +1722,7 @@ else echo "Hmm, doesn't look like you have an existing database." echo "Creating SQLite database..." %{script_dir}/create_sqlite_database + chown %{director_daemon_user}.%{daemon_group} %{working_dir}/bacula.db echo "Creating the SQLite tables..." %{script_dir}/make_sqlite_tables fi @@ -1772,10 +1799,13 @@ fi %attr(-, root, %{storage_daemon_group}) /usr/sbin/mtx %attr(-, root, %{storage_daemon_group}) /usr/sbin/scsitape %attr(-, root, %{storage_daemon_group}) /usr/sbin/tapeinfo +%attr(-, root, %{storage_daemon_group}) /usr/sbin/nsmhack +%attr(-, root, %{storage_daemon_group}) /usr/sbin/scsieject %{_mandir}/man1/loaderinfo.1.%{manpage_ext} %{_mandir}/man1/mtx.1.%{manpage_ext} %{_mandir}/man1/scsitape.1.%{manpage_ext} %{_mandir}/man1/tapeinfo.1.%{manpage_ext} +%{_mandir}/man1/scsieject.1.%{manpage_ext} %endif %files client @@ -2020,6 +2050,18 @@ fi %endif %changelog +* Sun Nov 04 2007 D. Scott Barninger +- fix dist defines for rhel5 and clones +- fix rhel broken 64 bit QT4 paths +- rh qt4 packages don't provide qt so fix that too +* Mon Oct 29 2007 D. Scott Barninger +- correct ownership when creating sqlite db file in post script +* Sun Sep 16 2007 D. Scott Barninger +- fix disable-batch-insert +* Fri Sep 14 2007 D. Scott Barninger +- 2.2.4 release +- turn off gconsole build for fc3, tray monitor fails to build +- add new files for mtx package (09Sep07 depkgs update) * Sat Sep 08 2007 D. Scott Barninger - add --disable-batch-insert for older platforms - add build targets for rhel5 and clones