diff --git a/.gitignore b/.gitignore index 5e0a8ca..1747d91 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ bacula-docs-5.0.3.tar.bz2 /bacula-9.0.4.tar.gz /bacula-9.0.5.tar.gz /bacula-9.0.6.tar.gz +/bacula-9.0.7.tar.gz diff --git a/bacula-7.0.4-autoconf.patch b/bacula-7.0.4-autoconf.patch deleted file mode 100644 index 0cfe4c8..0000000 --- a/bacula-7.0.4-autoconf.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur bacula-7.0.4.old/autoconf/ltmain.sh bacula-7.0.4/autoconf/ltmain.sh ---- bacula-7.0.4.old/autoconf/ltmain.sh 2014-07-24 17:43:23.085243360 +0200 -+++ bacula-7.0.4/autoconf/ltmain.sh 2014-07-24 17:45:12.505330842 +0200 -@@ -2429,6 +2429,7 @@ - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension -+ -soname SONAME override the standard shared object name - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries -@@ -5434,6 +5435,11 @@ - prev= - continue - ;; -+ soname) -+ soname_spec="$arg" -+ prev= -+ continue -+ ;; - weak) - func_append weak_libs " $arg" - prev= -@@ -5754,6 +5760,11 @@ - continue - ;; - -+ -soname) -+ prev=soname -+ continue -+ ;; -+ - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that diff --git a/bacula.spec b/bacula.spec index b081924..b28ec7a 100644 --- a/bacula.spec +++ b/bacula.spec @@ -1,9 +1,12 @@ %global uid 133 %global username bacula +# Disable annobin +%undefine _annotated_build + Name: bacula -Version: 9.0.6 -Release: 4%{?dist} +Version: 9.0.7 +Release: 1%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -40,13 +43,6 @@ Patch8: %{name}-9.0.2-desktop.patch # http://bugs.bacula.org/view.php?id=2354 Patch9: %{name}-9.0.6-tray-monitor-task.patch -# Original patch removed by mistake, upstream is not willing to add it again: -# http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a -# Without this, there is no library providing the correct shared object name -# required by the daemons. -# http://bugs.bacula.org/view.php?id=2084 -Patch10: %{name}-7.0.4-autoconf.patch - BuildRequires: desktop-file-utils BuildRequires: perl-generators BuildRequires: sed @@ -63,28 +59,28 @@ BuildRequires: lzo-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: postgresql-devel -BuildRequires: qt4-devel >= 4.6.2 BuildRequires: readline-devel BuildRequires: sqlite-devel BuildRequires: zlib-devel # https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 BuildRequires: perl-interpreter %else BuildRequires: perl %endif - %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: systemd %endif -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 BuildRequires: mariadb-connector-c-devel +BuildRequires: qt5-devel %else BuildRequires: mysql-devel BuildRequires: tcp_wrappers-devel +BuildRequires: qt4-devel >= 4.6.2 %endif %description @@ -323,7 +319,6 @@ Provides check_bacula support for Nagios. %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -333,7 +328,11 @@ find updatedb -type f | xargs chmod -x %build export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses" export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses" +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 +export PATH="$PATH:%{_qt5_bindir}" +%else export PATH="$PATH:%{_qt4_bindir}" +%endif %configure \ --disable-conio \ --disable-rpath \ @@ -366,7 +365,7 @@ export PATH="$PATH:%{_qt4_bindir}" --with-smtp-host=localhost \ --with-sqlite3 \ --with-subsys-dir=%{_localstatedir}/lock/subsys \ -%if 0%{!?fedora} >= 28 || 0%{!?rhel} >= 8 +%if 0%{!?fedora} >= 28 || 0%{!?rhel} > 7 --with-tcp-wrappers \ %endif --with-working-dir=%{_localstatedir}/spool/bacula \ @@ -380,7 +379,11 @@ make %{?_smp_mflags} make -C examples/nagios/check_bacula pushd src/qt-console/tray-monitor +%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 + %{?qmake_qt5}%{!?qmake_qt5:qmake-qt5} tray-monitor.pro +%else %{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro +%endif make %{?_smp_mflags} cp -f .libs/bacula-tray-monitor . popd @@ -730,6 +733,19 @@ fi %{_libdir}/nagios/plugins/check_bacula %changelog +* Mon May 14 2018 Simone Caronni - 9.0.7-1 +- Update to 9.0.7. +- Do not override libbaccats soname anymore. As of Fedora 28, the RPM assembly + process re-adds the symlink for the missing soname at build time, even if it + is explicitly deleted in the install section. +- Temporarily disable annotated build. + +* Wed Feb 07 2018 Josef Ridky - 9.0.6-8 +- Return support of Qt4 for older releases + +* Tue Feb 06 2018 Josef Ridky - 9.0.6-6 +- Build bacula against Qt5. + * Mon Jan 29 2018 Simone Caronni - 9.0.6-4 - Fix tray monitor build on RHEL/CentOS 7. diff --git a/sources b/sources index 1fb10bd..98741d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bacula-9.0.6.tar.gz) = a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e +SHA512 (bacula-9.0.7.tar.gz) = ef49830a9f94773f63e1168c95c8097ca5828e07a0af2c4155927129ce592ae9c5a71b8e0fab6f62882ca6ffc1418fc3a36b84c8425776026eb9b3769eeaecb7