From e8278724aa3bf65df4bcdb536f681a94021bf9af Mon Sep 17 00:00:00 2001
From: Scott Barninger <sbarn@scott.localdomain>
Date: Sat, 27 Feb 2010 13:33:10 -0500
Subject: [PATCH] Move bacula shared objects in separate bacula-libs package.

---
 bacula/platforms/rpm/bacula-bat.spec |  3 ++
 bacula/platforms/rpm/bacula.spec     | 62 +++++++++++++++-------------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/bacula/platforms/rpm/bacula-bat.spec b/bacula/platforms/rpm/bacula-bat.spec
index bb88310c66..aaec507d95 100644
--- a/bacula/platforms/rpm/bacula-bat.spec
+++ b/bacula/platforms/rpm/bacula-bat.spec
@@ -107,6 +107,7 @@ Requires: libgcc
 Requires: libpng
 Requires: libstdc++
 Requires: zlib
+Requires: bacula-libs
 
 %if %{suse}
 Requires: /usr/bin/kdesu
@@ -291,6 +292,8 @@ fi
 rm -rf $RPM_BUILD_DIR/depkgs-qt
 
 %changelog
+* Sat Feb 27 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add dependency on bacula-libs
 * Sat Feb 13 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - create file to allow bat to run nonroot with kdesu
 - add dependency information
diff --git a/bacula/platforms/rpm/bacula.spec b/bacula/platforms/rpm/bacula.spec
index 27ed2a7a19..a7fc3655f5 100644
--- a/bacula/platforms/rpm/bacula.spec
+++ b/bacula/platforms/rpm/bacula.spec
@@ -555,7 +555,7 @@ Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server
 Conflicts: bacula-client
 
 Requires: ncurses, libstdc++, zlib, openssl
-Requires: glibc, readline
+Requires: glibc, readline, bacula-libs
 
 %if %{suse}
 Conflicts: bacula
@@ -628,7 +628,7 @@ Provides: bacula
 %endif
 
 Requires: libstdc++, zlib, openssl
-Requires: glibc, readline
+Requires: glibc, readline, bacula-libs
 
 %if %{suse}
 Requires: termcap
@@ -681,6 +681,24 @@ This package installs scripts for updating older versions of the bacula
 database.
 %endif
 
+%package libs
+
+Summary: Bacula - The Network Backup Solution
+Group: System Environment/Daemons
+
+%description libs
+%{blurb}
+
+%{blurb2}
+%{blurb3}
+%{blurb4}
+%{blurb5}
+%{blurb6}
+%{blurb7}
+%{blurb8}
+
+This package installs the shared libraries used by many bacula programs.
+
 # Must explicitly enable debug pkg on SuSE
 # but not in opensuse_bs
 %if %{suse} && ! 0%{?opensuse_bs}
@@ -1049,7 +1067,6 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %{_mandir}/man8/dbcheck.8.%{manpage_ext}
 %{_mandir}/man1/bsmtp.1.%{manpage_ext}
 %{_mandir}/man1/bat.1.%{manpage_ext}
-%{_libdir}/libbac*
 %_prefix/share/doc/*
 
 # opensuse build service changes the release itself
@@ -1303,8 +1320,6 @@ if [ -d %{sysconf_dir} ]; then
       cp -f $file.new $file; rm -f $file.new
    done
 fi
-/sbin/ldconfig
-exit 0
 %endif
 
 
@@ -1325,22 +1340,6 @@ if [ $1 = 0 ]; then
   /sbin/chkconfig --del bacula-fd
   /sbin/chkconfig --del bacula-sd
 fi
-/sbin/ldconfig
-exit 0
-%endif
-
-%if %{mysql}
-%postun mysql
-%endif
-%if %{sqlite}
-%postun sqlite
-%endif
-%if %{postgresql}
-%postun postgresql
-%endif
-%if ! %{client_only}
-/sbin/ldconfig
-exit 0
 %endif
 
 %files client
@@ -1366,10 +1365,6 @@ exit 0
 %{_mandir}/man8/bconsole.8.%{manpage_ext}
 %{_mandir}/man8/btraceback.8.%{manpage_ext}
 %{_mandir}/man1/bat.1.%{manpage_ext}
-%{_libdir}/libbac*
-%{_libdir}/libbaccfg*
-%{_libdir}/libbacfind*
-%{_libdir}/libbacpy*
 %_prefix/share/doc/*
 
 %pre client
@@ -1419,15 +1414,24 @@ if [ -d %{sysconf_dir} ]; then
    done
 fi
 
-/sbin/ldconfig
-exit 0
 %preun client
 # delete our link
 if [ $1 = 0 ]; then
    /sbin/chkconfig --del bacula-fd
 fi
 
-%postun client
+%files libs
+%defattr(-,root,root)
+%{_libdir}/libbac*
+%{_libdir}/libbaccfg*
+%{_libdir}/libbacfind*
+%{_libdir}/libbacpy*
+
+%post libs
+/sbin/ldconfig
+exit 0
+
+%postun libs
 /sbin/ldconfig
 exit 0
 
@@ -1452,6 +1456,8 @@ echo "The database update scripts were installed to %{script_dir}/updatedb"
 %endif
 
 %changelog
+* Sat Feb 27 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- move shared libraries into bacula-libs package
 * Sat Feb 20 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - remove deprecated mysql4 and mysql5 build defines
 - add build support for tcpwrappers
-- 
2.39.5