@@ -194,9 +194,6 @@

 %build

 touch platforms/suse/bacula.spec.in

-

-%install

-#Build() {

 CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS $(ncurses5-config --cflags)"  LDFLAGS="-L/usr/%{_lib}/mysql $(ncurses5-config --libs)" ./configure \

    --prefix=%{_prefix} \

    --libexecdir=%{_libdir} \

@@ -214,27 +211,11 @@

    --enable-shared \

    --with-mysql --with-postgresql

    "$@"

-#}

-# build mysql version

-#Build --with-mysql --with-postgresql=no

-# ##make CFLAGS="$RPM_OPT_FLAGS"

+

 %{__make}

-make DESTDIR=$RPM_BUILD_ROOT install

-##mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd  $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.mysql

-#mv $RPM_BUILD_ROOT%{_sbindir}/bacula-dir $RPM_BUILD_ROOT%{_sbindir}/bacula-dir.mysql

-##mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.mysql

-#mv $RPM_BUILD_ROOT%{_sbindir}/bscan $RPM_BUILD_ROOT%{_sbindir}/bscan.mysql

-

-# build postgresql version

-#%{__make} clean

-#Build --with-postgresql --with-mysql=no

-## ##make CFLAGS="$RPM_OPT_FLAGS"

-#%{__make}

-#make DESTDIR=$RPM_BUILD_ROOT install

-##mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd  $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.postgresql

-#mv $RPM_BUILD_ROOT%{_sbindir}/bacula-dir $RPM_BUILD_ROOT%{_sbindir}/bacula-dir.postgresql

-##mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.postgresql

-#mv $RPM_BUILD_ROOT%{_sbindir}/bscan $RPM_BUILD_ROOT%{_sbindir}/bscan.postgresql

+

+%install

+%__make DESTDIR=$RPM_BUILD_ROOT install

 # build nagios plugin

 PREDIR=`pwd`

@@ -312,57 +293,6 @@

 /sbin/service bacula-sd restart || :

 %endif

-#%post server-mysql

-#if [ -f %{_sbindir}/bacula-dir.mysql ] ;then

-#ln -sf %{_sbindir}/bacula-dir.mysql %{_sbindir}/bacula-dir

-#ln -sf %{_libdir}/libbaccats-mysql-%{_sover}.so %{_libdir}/libbaccats-%{_sover}.so

-#ln -sf %{_libdir}/libbaccats-%{_sover}.so %{_libdir}/libbaccats.so

-#fi

-#if [ -f %{_sbindir}/bscan.mysql ] ; then

-#ln -sf %{_sbindir}/bscan.mysql %{_sbindir}/bscan

-#fi

-#

-#

-#%post server-postgresql

-#if [ -f %{_sbindir}/bacula-dir.postgresql ] ;then

-#ln -sf %{_sbindir}/bacula-dir.postgresql %{_sbindir}/bacula-dir

-#ln -sf %{_libdir}/libbaccats-postgresql-%{_sover}.so %{_libdir}/libbaccats-%{_sover}.so

-#ln -sf %{_libdir}/libbaccats-%{_sover}.so %{_libdir}/libbaccats.so

-#fi

-#if [ -f %{_sbindir}/bscan.postgresql ] ; then

-#ln -sf %{_sbindir}/bscan.postgresql %{_sbindir}/bscan

-#fi

-

-

-#%postun server-mysql

-#%if 0%{?suse_version}

-#%restart_on_update bacula-dir bacula-sd

-#%else

-#/sbin/service bacula-dir restart || :

-#/sbin/service bacula-sd restart || :

-#%endif

-#

-#%postun server-postgresql

-#%if 0%{?suse_version}

-#%restart_on_update bacula-dir bacula-sd

-#%else

-#/sbin/service bacula-dir restart || :

-#/sbin/service bacula-sd restart || :

-#%endif

-

-#%preun server-mysql

-#if [ $1 == 0 ] ; then

-#rm -f %{_sbindir}/bacula-dir

-###rm -f %{_sbindir}/bacula-sd

-#fi

-

-#%preun server-postgresql

-#if [ $1 == 0 ] ; then

-#rm -f %{_sbindir}/bacula-dir

-###rm -f %{_sbindir}/bacula-sd

-#fi

-

-

 %files

 %defattr(-,root,root)   

 %config /etc/init.d/bacula-fd

@@ -377,7 +307,6 @@

 %config /etc/bacula/btraceback.dbx

 %config /etc/bacula/btraceback.gdb

 %config /etc/bacula/btraceback.mdb

-##%config /etc/bacula/gconsole

 %config /etc/bacula/mtx-changer

 %config /etc/bacula/bacula

 %config /etc/bacula/dvd-handler

@@ -405,10 +334,8 @@

 %{_sbindir}/dbcheck

 %{_sbindir}/bcopy

 %{_sbindir}/bacula-sd

-##%exclude %{_sbindir}/bacula-sd*

-%{_sbindir}/bacula-dir*

-%{_sbindir}/bscan*

-##%exclude %{_sbindir}/bcopy*

+%{_sbindir}/bacula-dir

+%{_sbindir}/bscan

 %exclude %{_sbindir}/bacula-fd

 %exclude %{_sbindir}/rcbacula-fd

 %config(noreplace) /etc/bacula/bacula-dir.conf

@@ -428,20 +355,6 @@

 %dir /var/lib/bacula

 %dir /var/lib/bacula/working

-#%files server-postgresql

-#%defattr(-,root,root)

-##%{_sbindir}/bacula-sd.postgresql

-##%{_sbindir}/bacula-dir.postgresql

-##%{_sbindir}/bscan.postgresql

-##%{_sbindir}/bcopy.postgresql

-

-#%files server-mysql

-#%defattr(-,root,root)

-##%{_sbindir}/bacula-sd.mysql

-##%{_sbindir}/bacula-dir.mysql

-##%{_sbindir}/bscan.mysql

-##%{_sbindir}/bcopy.mysql

-

 %files -n libbaccats-%{_libver}

 %defattr(-,root,root)

 %{_libdir}/libbaccats-mysql-%{_sover}.so

​