]> git.pld-linux.org Git - packages/bacula.git/commitdiff
- started update to 5.2.1; dbi is gone; support for multiple databases is base in...
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Tue, 1 Nov 2011 17:17:00 +0000 (17:17 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    bacula-dbi_dbcheck.patch -> 1.2
    bacula-dbi_fixes.patch -> 1.4
    bacula-dvd_rewind.patch -> 1.2
    bacula-link.patch -> 1.5
    bacula-openssl1.patch -> 1.6
    bacula-tinfo-readline.patch -> 1.7
    bacula.spec -> 1.182
    make_catalog_backup-setup-home.patch -> 1.2
    qmake-bin.patch -> 1.2

bacula-dbi_dbcheck.patch [deleted file]
bacula-dbi_fixes.patch [deleted file]
bacula-dvd_rewind.patch [deleted file]
bacula-link.patch [deleted file]
bacula-openssl1.patch [deleted file]
bacula-tinfo-readline.patch [deleted file]
bacula.spec
make_catalog_backup-setup-home.patch
qmake-bin.patch [deleted file]

diff --git a/bacula-dbi_dbcheck.patch b/bacula-dbi_dbcheck.patch
deleted file mode 100644 (file)
index ddd4149..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- bacula-5.0.1/src/cats/dbi.c.orig   2010-02-24 16:33:48.000000000 +0100
-+++ bacula-5.0.1/src/cats/dbi.c        2010-03-16 09:12:10.000000000 +0100
-@@ -717,6 +717,11 @@
-    return errmsg;
- }
-+void db_check_backend_thread_safe()
-+{
-+   Emsg0(M_WARNING, 0, _("Cannot be sure if DBI is thread-safe"));
-+}
-+
- #ifdef HAVE_BATCH_FILE_INSERT
- /*
diff --git a/bacula-dbi_fixes.patch b/bacula-dbi_fixes.patch
deleted file mode 100644 (file)
index e320916..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
---- bacula-3.0.0.orig/Makefile.in      2009-04-22 11:34:25.143705345 +0200
-+++ bacula-3.0.0/Makefile.in   2009-04-22 11:46:51.634779414 +0200
-@@ -191,8 +191,8 @@
-       (cd src/cats; \
-        chmod 755 create_bacula_database      update_bacula_tables     make_bacula_tables; \
-        chmod 755 grant_bacula_privileges     drop_bacula_tables       drop_bacula_database; \
--       chmod 755 create_@DB_TYPE@_database   update_@DB_TYPE@_tables  make_@DB_TYPE@_tables; \
--       chmod 755 grant_@DB_TYPE@_privileges  drop_@DB_TYPE@_tables    drop_@DB_TYPE@_database; \
-+       chmod 755 create_*_database   update_*_tables  make_*_tables fix_*_tables; \
-+       chmod 755 grant_*_privileges  drop_*_tables    drop_*_database; \
-        chmod 755 make_catalog_backup delete_catalog_backup)
-       (cd src/qt-console; \
-        chmod 755 install_conf_file build-depkgs-qt-console)
---- bacula-3.0.0.orig/src/cats/Makefile.in     2009-04-22 11:34:25.204854395 +0200
-+++ bacula-3.0.0/src/cats/Makefile.in  2009-04-22 12:05:18.107024138 +0200
-@@ -125,19 +125,16 @@
-       $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la
- install: @LIBTOOL_INSTALL_TARGET@ @INCLUDE_INSTALL_TARGET@
--      $(INSTALL_SCRIPT) create_@DB_TYPE@_database $(DESTDIR)$(scriptdir)/create_@DB_TYPE@_database
--      $(INSTALL_SCRIPT) update_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/update_@DB_TYPE@_tables
--      $(INSTALL_SCRIPT) make_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/make_@DB_TYPE@_tables
--      $(INSTALL_SCRIPT) grant_@DB_TYPE@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_TYPE@_privileges
--      $(INSTALL_SCRIPT) drop_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/drop_@DB_TYPE@_tables
--      $(INSTALL_SCRIPT) drop_@DB_TYPE@_database $(DESTDIR)$(scriptdir)/drop_@DB_TYPE@_database
--
--      $(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database
--      $(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables
--      $(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
--      $(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(scriptdir)/grant_bacula_privileges
--      $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
--      $(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database
-+      for dbtype in bdb mysql postgresql sqlite3 sqlite; do \
-+              [ ! -f create_$${dbtype}_database ] || $(INSTALL_SCRIPT) create_$${dbtype}_database $(DESTDIR)$(scriptdir)/create_$${dbtype}_database; \
-+              [ ! -f update_$${dbtype}_tables ] || $(INSTALL_SCRIPT) update_$${dbtype}_tables $(DESTDIR)$(scriptdir)/update_$${dbtype}_tables; \
-+              [ ! -f make_$${dbtype}_tables ] || $(INSTALL_SCRIPT) make_$${dbtype}_tables $(DESTDIR)$(scriptdir)/make_$${dbtype}_tables; \
-+              [ ! -f grant_$${dbtype}_privileges ] || $(INSTALL_SCRIPT) grant_$${dbtype}_privileges $(DESTDIR)$(scriptdir)/grant_$${dbtype}_privileges; \
-+              [ ! -f drop_$${dbtype}_tables ] || $(INSTALL_SCRIPT) drop_$${dbtype}_tables $(DESTDIR)$(scriptdir)/drop_$${dbtype}_tables; \
-+              [ ! -f drop_$${dbtype}_database ] || $(INSTALL_SCRIPT) drop_$${dbtype}_database $(DESTDIR)$(scriptdir)/drop_$${dbtype}_database; \
-+      done
-+
-+              $(INSTALL_SCRIPT) fix_postgresql_tables $(DESTDIR)$(scriptdir)/fix_postgresql_tables
-       @filename=make_catalog_backup; \
-          if  test -f $(DESTDIR)$(scriptdir)/$$filename; then \
diff --git a/bacula-dvd_rewind.patch b/bacula-dvd_rewind.patch
deleted file mode 100644 (file)
index a1d6e23..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- bacula-5.0.3/src/stored/dev.c.orig 2010-08-05 16:29:51.000000000 +0200
-+++ bacula-5.0.3/src/stored/dev.c      2010-09-21 09:53:25.000000000 +0200
-@@ -832,7 +832,7 @@
-          }
-          break;
-       }
--   } else if (is_file() || is_dvd()) {
-+   } else if (dcr && (is_file() || is_dvd())) {
-       if (lseek(dcr, (boffset_t)0, SEEK_SET) < 0) {
-          berrno be;
-          dev_errno = errno;
diff --git a/bacula-link.patch b/bacula-link.patch
deleted file mode 100644 (file)
index 19b6d17..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/lib/Makefile.in.orig   2010-08-14 23:46:56.290270219 +0200
-+++ src/lib/Makefile.in        2010-08-14 23:47:35.640255402 +0200
-@@ -119,7 +119,7 @@
- libbac.la: Makefile $(LIBBAC_LOBJS)
-       @echo "Making $@ ..."
--      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
-+      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS)
- libbaccfg.a: $(LIBBACCFG_OBJS) 
-       @echo "Making $@ ..."
-@@ -128,7 +128,7 @@
- libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
-       @echo "Making $@ ..."
--      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE)
-+      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS)
- libbacpy.a: $(LIBBACPY_OBJS) 
-       @echo "Making $@ ..."
-@@ -137,7 +137,7 @@
- libbacpy.la: Makefile $(LIBBACPY_LOBJS) 
-       @echo "Making $@ ..."
--      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS)
-+      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
-       cd $(topdir) \
diff --git a/bacula-openssl1.patch b/bacula-openssl1.patch
deleted file mode 100644 (file)
index 98aaa3f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- bacula-5.0.3.orig/autoconf/configure.in.orig       2010-08-06 20:31:44.000000000 +0000
-+++ bacula-5.0.3.orig/autoconf/configure.in    2010-08-06 20:36:59.000000000 +0000
-@@ -1188,7 +1188,7 @@
-    fi
-    if test "$support_crypto" = "yes"; then
--      AC_CHECK_LIB(ssl, EVP_PKEY_encrypt_old, AC_DEFINE(HAVE_OPENSSLv1, 1, [Set if have OpenSSL version 1.x]))
-+      AC_CHECK_LIB(crypto, EVP_PKEY_encrypt_old, AC_DEFINE(HAVE_OPENSSLv1, 1, [Set if have OpenSSL version 1.x]))
-    fi
-    LIBS="${saved_LIBS}"
diff --git a/bacula-tinfo-readline.patch b/bacula-tinfo-readline.patch
deleted file mode 100644 (file)
index fa2c31d..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- bacula-5.0.3/autoconf/configure.in~        2010-08-05 17:29:51.000000000 +0300
-+++ bacula-5.0.3/autoconf/configure.in 2010-08-22 18:48:37.975555296 +0300
-@@ -813,11 +813,12 @@
- fi
- TERM_LIB=""
--AC_CHECK_HEADER(curses.h, 
--  [ AC_CHECK_LIB(ncurses, tgetent, 
--    [ TERM_LIB="-lncurses" ],
--    [ AC_CHECK_LIB(termcap, tgetent, [ TERM_LIB="-ltermcap" ])
-+AC_CHECK_HEADER(curses.h, [
-+  AC_CHECK_LIB(tinfo, tgetent, [ TERM_LIB="-ltinfo" ], [
-+   AC_CHECK_LIB(ncurses, tgetent, [ TERM_LIB="-lncurses" ], [
-+    AC_CHECK_LIB(termcap, tgetent, [ TERM_LIB="-ltermcap" ])
-     ])
-+  ])
-   ],
-   [  AC_CHECK_HEADERS(curses.h)
-      AC_CHECK_HEADER(term.h,
index 1be25c2944265c6403cc3d27993782cfa7b83768..ca39a97bbf403346cd8b566890a3af9209641ae7 100644 (file)
@@ -5,12 +5,8 @@
 #
 # Conditional build:
 %bcond_without console_wx              # wx-console program
+%bcond_without console_gnome           # gnome console
 %bcond_without bat                     # bat Qt4 GUI
-%if "%{pld_release}" != "ac"
-%bcond_without dbi                     # use Database Independent Abstraction Layer (libdbi)
-%else
-%bcond_with            dbi                     # use Database Independent Abstraction Layer (libdbi)
-%endif
 %bcond_without mysql                   # use MySQL
 %bcond_without pgsql                   # use PostgreSQL
 %bcond_without sqlite3                 # use SQLite3
 Summary:       Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
-Version:       5.0.3
-Release:       15
+Version:       5.2.1
+Release:       0.1
 License:       AGPL v3
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5: 9de254ae39cab0587fdb2f5d8d90b03b
+# Source0-md5: 793da9f89fc5e024b6b95eb16a3120e5
 Source1:       http://downloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
-# Source1-md5: 7a00557dcf0dfa40de9e74176fefd1ae
+# Source1-md5: d4db495def9e7843bcca8aff2d4d493b
 Source2:       http://downloads.sourceforge.net/bacula/%{name}-rescue-5.0.1.tar.gz
 # Source2-md5: bb194aed8e204f54bf2f61d7e721f257
 Source10:      %{name}-dir.init
@@ -44,18 +40,11 @@ Source14:   %{name}-dir.sysconfig
 Source15:      %{name}-fd.sysconfig
 Source16:      %{name}-sd.sysconfig
 Patch0:                %{name}-mtx-changer.patch
-Patch1:                %{name}-link.patch
-Patch2:                %{name}-tinfo-readline.patch
-Patch3:                %{name}-branding.patch
-Patch4:                %{name}-conf.patch
-Patch5:                %{name}-desktop.patch
-Patch7:                %{name}-dbi_fixes.patch
-Patch8:                %{name}-dbi_dbcheck.patch
-Patch9:                %{name}-openssl1.patch
-Patch10:       %{name}-dvd_rewind.patch
-Patch11:       qmake-bin.patch
-Patch13:       make_catalog_backup-setup-home.patch
-Patch14:       %{name}-mysql_thread.patch
+Patch1:                %{name}-branding.patch
+Patch2:                %{name}-conf.patch
+Patch3:                %{name}-desktop.patch
+Patch4:                make_catalog_backup-setup-home.patch
+Patch5:                %{name}-mysql_thread.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -63,7 +52,6 @@ BuildRequires:        automake
 BuildRequires: gettext-devel
 %{?with_console_wx:BuildRequires:      gtk+2-devel}
 BuildRequires: libcap-devel
-%{?with_dbi:BuildRequires:     libdbi-devel >= 0.8.4}
 BuildRequires: libtool >= 2:2.2
 %if %{with rescue}
 BuildRequires: fakeroot
@@ -102,7 +90,7 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                nagiosplugindir %{_libdir}/nagios/plugins
 
 # from 'the worst' to 'the best'
-%define        databases %{?with_dbi:dbi} %{?with_sqlite3:sqlite3} %{?with_mysql:mysql} %{?with_pgsql:postgresql}
+%define        databases %{?with_sqlite3:sqlite3} %{?with_mysql:mysql} %{?with_pgsql:postgresql}
 
 # dependency section is broken. ccache usage is instead to makefiles
 %undefine      with_ccache
@@ -398,21 +386,6 @@ SQLite database driver for Bacula.
 %description db-sqlite3 -l pl.UTF-8
 Sterownik bazy SQLite dla Baculi.
 
-%package db-dbi
-Summary:       libdbi database driver for Bacula
-Summary(pl.UTF-8):     Sterownik bazy libdbi dla Baculi
-Group:         Networking/Utilities
-Requires(post):        /sbin/ldconfig
-Requires:      %{name}-common = %{version}-%{release}
-Provides:      bacula(db) = %{version}-%{release}
-Obsoletes:     bacula(db)
-
-%description db-dbi
-libdbi database driver for Bacula.
-
-%description db-dbi -l pl.UTF-8
-Sterownik baz libdbi dla Baculi.
-
 %package rescue
 Summary:       Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
@@ -462,18 +435,11 @@ Nagios plugin to check bacula.
 %prep
 %setup -q -a 1
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch13 -p1
-%patch14 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -483,12 +449,6 @@ sed -i -e 's#bindir=.*#bindir=%{_bindir}#g' \
 sed -i -e 's/@hostname@/--hostname--/' src/*/*.conf.in
 sed -i -e 's/@basename@/--hostname--/' src/*/*.conf.in
 
-%if %{with dbi}
-for dbtype in mysql postgresql sqlite3; do
-       sed -i -e "s,@DB_TYPE@,$dbtype,g" src/cats/*_${dbtype}_*
-done
-%endif
-
 %build
 cd autoconf
 %{__aclocal} -I bacula-macros -I gettext-macros
@@ -499,46 +459,37 @@ cd ..
 
 CPPFLAGS="-I/usr/include/ncurses -I%{_includedir}/readline"
 
-# we wan't the 'base' build built with the last database in the list,
-# to make sure it is full-featured
-for database in %{databases}; do
-       WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
-       QMAKE=%{_bindir}/qt4-qmake \
-       %configure \
-               --with-scriptdir=%{_libexecdir}/%{name} \
-               %{?with_bat:--enable-bat} \
-               --disable-conio \
-               --enable-smartalloc \
-               %{?with_console_wx:--enable-bwx-console} \
-               --enable-tray-monitor \
-               %{?with_python:--with-python} \
-               --with-readline \
-               --with-tcp-wrappers \
-               --with-working-dir=%{_var}/lib/%{name} \
-               --with-dump-email="root@localhost" \
-               --with-job-email="root@localhost" \
-               --with-smtp-host=localhost \
-               --with-pid-dir=/var/run \
-               --with-subsys-dir=/var/lock/subsys \
-               --enable-batch-insert \
-               --with-$database \
-               %{?with_sqlite3_sync_off:--enable-extra-sqlite3-init="pragma synchronous=0;"} \
-               --with-dir-password="#FAKE-dir-password#" \
-               --with-fd-password="#FAKE-fd-password#" \
-               --with-sd-password="#FAKE-sd-password#" \
-               --with-mon-dir-password="#FAKE-mon-dir-password#" \
-               --with-mon-fd-password="#FAKE-mon-fd-password#" \
-               --with-mon-sd-password="#FAKE-mon-sd-password#" \
-               --with-openssl
-
-       # build the database library
-       %{__make} -C src/cats clean
-       %{__make} -C src/cats
-
-       # install the database library in a temporary location
-       install -d libbacsql/$database%{_libdir}/%{name}
-       %{__make} -C src/cats install DESTDIR=$PWD/libbacsql/$database
-done
+WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
+QMAKE=%{_bindir}/qt4-qmake \
+%configure \
+       --with-scriptdir=%{_libexecdir}/%{name} \
+       %{?with_bat:--enable-bat} \
+       --disable-conio \
+       --enable-smartalloc \
+       %{?with_console_wx:--enable-bwx-console} \
+       %{?with_console_gnome:--enable-gnome} \
+       --enable-tray-monitor \
+       %{?with_python:--with-python} \
+       --with-readline \
+       --with-tcp-wrappers \
+       --with-working-dir=%{_var}/lib/%{name} \
+       --with-dump-email="root@localhost" \
+       --with-job-email="root@localhost" \
+       --with-smtp-host=localhost \
+       --with-pid-dir=/var/run \
+       --with-subsys-dir=/var/lock/subsys \
+       --enable-batch-insert \
+       %{?with_pgsql:--with-postgresql} \
+       %{?with_mysql:--with-mysql} \
+       %{?with_sqlite3:--with-sqlite3} \
+       %{?with_sqlite3_sync_off:--enable-extra-sqlite3-init="pragma synchronous=0;"} \
+       --with-dir-password="#FAKE-dir-password#" \
+       --with-fd-password="#FAKE-fd-password#" \
+       --with-sd-password="#FAKE-sd-password#" \
+       --with-mon-dir-password="#FAKE-mon-dir-password#" \
+       --with-mon-fd-password="#FAKE-mon-fd-password#" \
+       --with-mon-sd-password="#FAKE-mon-sd-password#" \
+       --with-openssl
 
 %if %{with bat}
 cd src/qt-console
@@ -570,36 +521,14 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_mandir},%{_bindir},/
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# install libraries for all the database backends
-# ldconfig will add the soname symlinks when one of the packages is installed
-for database in %{databases}; do
-       for libfile in libbacsql/$database%{_libdir}/lib*-*.so; do
-               orig_name=${libfile##*/}
-               file_prefix=${orig_name%%-*.so}
-               file_suffix=${orig_name#*-}
-               file_name=$file_prefix-$database-$file_suffix
-               install -p $libfile $RPM_BUILD_ROOT%{_libdir}/$file_name
-               touch $RPM_BUILD_ROOT%{_libdir}/$orig_name
-       done
-
-       install -p libbacsql/$database%{_libdir}/%{name}/make_catalog_backup \
-               $RPM_BUILD_ROOT%{_libdir}/%{name}/make_${database}_catalog_backup
-done
-
-# placeholders for the symlinks set in %%post db-*
-for f in create_bacula_database drop_bacula_database drop_bacula_tables \
-       grant_bacula_privileges make_bacula_tables update_bacula_tables make_catalog_backup; do
-       > $RPM_BUILD_ROOT%{_libexecdir}/%{name}/$f
-done
-
 # we use db dependant (at compile time) shell script only
-rm -f $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_catalog_backup.pl
-# dbi is not actual dbtype
-rm -f $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_dbi_catalog_backup
+rm $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_catalog_backup.pl
+## dbi is not actual dbtype
+#rm $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_dbi_catalog_backup
 
-# replace with empty file, replaced by ldconfig from each db-* package on intsall
-rm -f $RPM_BUILD_ROOT%{_libdir}/libbacsql-%{version}.so
-touch $RPM_BUILD_ROOT%{_libdir}/libbacsql-%{version}.so
+## replace with empty file, replaced by ldconfig from each db-* package on intsall
+#rm $RPM_BUILD_ROOT%{_libdir}/libbaccats-%{version}.so
+#touch $RPM_BUILD_ROOT%{_libdir}/libbaccats-%{version}.so
 
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-dir
 install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-fd
@@ -677,6 +606,9 @@ mv $RPM_BUILD_ROOT%{_mandir}/man8/{,bacula-}dbcheck.8.gz
 # no -devel files packaged, so this is also useless
 rm $RPM_BUILD_ROOT%{_libdir}/libbac{,cfg,find,py,sql}.{so,la}
 
+# FIXME, something in post
+rm $RPM_BUILD_ROOT/usr/lib64/libbaccats-5.2.1.so
+
 %if %{with nagios}
 install -d $RPM_BUILD_ROOT%{nagiosplugindir}
 %{__make} -C examples/nagios/check_bacula install \
@@ -826,13 +758,6 @@ ln -sf "make_%{1}_catalog_backup" %{_libexecdir}/%{name}/make_catalog_backup ||
 
 %postun db-sqlite3 -p /sbin/ldconfig
 
-# dbi backend is different, as it is not bound with a specific db engine
-%post db-dbi
-/sbin/ldconfig
-%service bacula-dir restart "Bacula Director daemon"
-
-%postun db-dbi -p /sbin/ldconfig
-
 %files common
 %defattr(644,root,root,755)
 %doc LICENSE
@@ -877,24 +802,24 @@ ln -sf "make_%{1}_catalog_backup" %{_libexecdir}/%{name}/make_catalog_backup ||
 
 %files db-postgresql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/%{name}/fix_postgresql_tables
+#%attr(755,root,root) %{_libexecdir}/%{name}/fix_postgresql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/create_postgresql_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_postgresql_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_postgresql_*
-%attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_catalog_backup
-%attr(755,root,root) %{_libdir}/libbacsql-postgresql-5*.so
+#attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_catalog_backup
+%attr(755,root,root) %{_libdir}/libbaccats-postgresql-5*.so
 
-%ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
+#%ghost %attr(755,root,root) %{_libdir}/libbaccats-5*.so
 %ghost %{_libexecdir}/%{name}/create_bacula_database
 %ghost %{_libexecdir}/%{name}/drop_bacula_tables
 %ghost %{_libexecdir}/%{name}/drop_bacula_database
 %ghost %{_libexecdir}/%{name}/grant_bacula_privileges
 %ghost %{_libexecdir}/%{name}/make_bacula_tables
 %ghost %{_libexecdir}/%{name}/update_bacula_tables
-%ghost %{_libexecdir}/%{name}/make_catalog_backup
+#%ghost %{_libexecdir}/%{name}/make_catalog_backup
 
 %files db-mysql
 %defattr(644,root,root,755)
@@ -904,17 +829,17 @@ ln -sf "make_%{1}_catalog_backup" %{_libexecdir}/%{name}/make_catalog_backup ||
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_mysql_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_mysql_*
-%attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_catalog_backup
-%attr(755,root,root) %{_libdir}/libbacsql-mysql-5*.so
+#%attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_catalog_backup
+%attr(755,root,root) %{_libdir}/libbaccats-mysql-5*.so
 
-%ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
+#%ghost %attr(755,root,root) %{_libdir}/libbaccats-5*.so
 %ghost %{_libexecdir}/%{name}/create_bacula_database
 %ghost %{_libexecdir}/%{name}/drop_bacula_tables
 %ghost %{_libexecdir}/%{name}/drop_bacula_database
 %ghost %{_libexecdir}/%{name}/grant_bacula_privileges
 %ghost %{_libexecdir}/%{name}/make_bacula_tables
 %ghost %{_libexecdir}/%{name}/update_bacula_tables
-%ghost %{_libexecdir}/%{name}/make_catalog_backup
+#%ghost %{_libexecdir}/%{name}/make_catalog_backup
 
 %files db-sqlite3
 %defattr(644,root,root,755)
@@ -924,46 +849,17 @@ ln -sf "make_%{1}_catalog_backup" %{_libexecdir}/%{name}/make_catalog_backup ||
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_sqlite3_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_*
-%attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_catalog_backup
-%attr(755,root,root) %{_libdir}/libbacsql-sqlite3-5*.so
+#%attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_catalog_backup
+%attr(755,root,root) %{_libdir}/libbaccats-sqlite3-5*.so
 
-%ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
+#%ghost %attr(755,root,root) %{_libdir}/libbaccats-5*.so
 %ghost %{_libexecdir}/%{name}/create_bacula_database
 %ghost %{_libexecdir}/%{name}/drop_bacula_tables
 %ghost %{_libexecdir}/%{name}/drop_bacula_database
 %ghost %{_libexecdir}/%{name}/grant_bacula_privileges
 %ghost %{_libexecdir}/%{name}/make_bacula_tables
 %ghost %{_libexecdir}/%{name}/update_bacula_tables
-%ghost %{_libexecdir}/%{name}/make_catalog_backup
-
-%if %{with dbi}
-%files db-dbi
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/%{name}/create_postgresql_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/grant_postgresql_privileges
-%attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_catalog_backup
-%attr(755,root,root) %{_libexecdir}/%{name}/update_postgresql_*
-%attr(755,root,root) %{_libexecdir}/%{name}/create_mysql_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_mysql_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_mysql_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/grant_mysql_privileges
-%attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_catalog_backup
-%attr(755,root,root) %{_libexecdir}/%{name}/update_mysql_*
-%attr(755,root,root) %{_libexecdir}/%{name}/create_sqlite3_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_sqlite3_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_sqlite3_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/grant_sqlite3_privileges
-%attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_*
-%attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_catalog_backup
-%attr(755,root,root) %{_libdir}/libbacsql-dbi-5*.so
-
-%ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
-%endif
+#%ghost %{_libexecdir}/%{name}/make_catalog_backup
 
 %files fd
 %defattr(644,root,root,755)
@@ -1011,8 +907,8 @@ ln -sf "make_%{1}_catalog_backup" %{_libexecdir}/%{name}/make_catalog_backup ||
 %doc LICENSE
 %{_pixmapsdir}/%{name}.png
 %{_desktopdir}/bacula-wx.desktop
-%attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bwx-console.conf
-%attr(755,root,root) %{_sbindir}/bwx-console
+#%attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bwx-console.conf
+#%attr(755,root,root) %{_sbindir}/bwx-console
 %{_mandir}/man1/bacula-bwxconsole.1*
 %endif
 
index 524ff2d0828efe23a6da035acd137d4ab220cc09..68d76a4265f93aae0bbfefa9335d910d42e37056 100644 (file)
@@ -1,16 +1,18 @@
---- bacula-5.0.3/./src/cats/make_catalog_backup.in~    2010-10-22 17:51:14.000000000 +0300
-+++ bacula-5.0.3/./src/cats/make_catalog_backup.in     2010-10-22 17:53:17.329321909 +0300
-@@ -13,11 +13,13 @@
+--- bacula-5.2.1/src/cats/make_catalog_backup.in~      2011-10-30 13:03:42.000000000 +0100
++++ bacula-5.2.1/src/cats/make_catalog_backup.in       2011-11-01 17:27:38.863760358 +0100
+@@ -13,12 +13,15 @@
  #     line arguments and the environment using ps.  Please consult your
  #     MySQL or PostgreSQL manual for secure methods of specifying the
  #     password.
-+#     In MySQL, you can create @working_dir@/.my.cnf and put password there in [client] section
++#     In MySQL, you can create @working_dir@/.my.cnf and put password there in [client] section.
  #  $4 is the host on which the database is located
  #     (default "")
+ #  $5 is the type of database
  #
  #
- BINDIR=@SQL_BINDIR@
 +HOME=@working_dir@
++
+ default_db_type=@DEFAULT_DB_TYPE@
  
- cd @working_dir@
- rm -f $1.sql
+ #
diff --git a/qmake-bin.patch b/qmake-bin.patch
deleted file mode 100644 (file)
index 70cf10c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
---- bacula-5.0.3/autoconf/configure.in~        2010-10-22 12:48:37.000000000 +0300
-+++ bacula-5.0.3/autoconf/configure.in 2010-10-22 12:50:14.083764096 +0300
-@@ -3195,13 +3195,12 @@
-       AC_MSG_ERROR([Could not find qmake $PATH. Check your Qt installation])
-    fi
--   QMAKEBIN="qmake"
-    cd src/qt-console
-    echo "Creating bat Makefile"
-    touch bat
-    chmod 755 bat
-    rm -f Makefile
--   $QMAKEBIN
-+   $QMAKE
-    ${MAKE:-make} clean
-    cd ${BUILD_DIR}
- fi
This page took 0.141515 seconds and 4 git commands to generate.